breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
ec2b76aab44f55be22eb12d86eb0dfd2eff68581
FFmpeg/libavcodec/h264_parse.h
James Almer 8c7932884d Merge commit 'f638b67e5790735f34620bf82025c9b9d6fc7216' 
* commit 'f638b67e5790735f34620bf82025c9b9d6fc7216':
  h264: move the parameter set definitions to a new header file

Conflicts:
libavcodec/h264_parse.h
libavcodec/h264_ps.c
libavcodec/h264dec.h

Merged-by: James Almer <jamrial@gmail.com>
2016-08-01 12:58:09 -03:00

3.4 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink