aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mpeg4video_parser.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-08 21:45:41 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-08 21:45:41 +0200
commit9da679e77fa25487ae37db11f010fde68034e362 (patch)
tree67ea58cbab5418d1c6de6c3cc62d7c0024a0be80 /libavcodec/mpeg4video_parser.h
parent911ba8fb197dee6fb1dd4ac2d1fa2d8541ab6ab5 (diff)
parent7ae9791b641d1183910b6e7faca23f7ae08f8579 (diff)
downloadffmpeg-9da679e77fa25487ae37db11f010fde68034e362.tar.gz
Merge commit '7ae9791b641d1183910b6e7faca23f7ae08f8579'
* commit '7ae9791b641d1183910b6e7faca23f7ae08f8579': avformat: bump version after mime_type change Conflicts: libavformat/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpeg4video_parser.h')
0 files changed, 0 insertions, 0 deletions