aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/dvdata.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-04 06:41:15 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-04 06:41:15 +0100
commit08dde7567dea076363e3b9f3d02a738390a698fa (patch)
tree6eedffaa36f01c678c8e667cf5f81551b9ab364e /libavcodec/dvdata.h
parentcb8180885f225df6ee6f03ac157aa7617a06ff50 (diff)
parent27f60e2b0b419066619c738b3c9b9376a83ed4b1 (diff)
downloadffmpeg-08dde7567dea076363e3b9f3d02a738390a698fa.tar.gz
Merge remote-tracking branch 'qatar/release/9' into release/1.1
* qatar/release/9: Update Changelog for 9.11 oggparseogm: check timing variables mathematics: remove asserts from av_rescale_rnd() vc1: Always reset numref when parsing a new frame header. h264: reset num_reorder_frames if it is invalid Conflicts: Changelog libavcodec/vc1.c libavutil/mathematics.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dvdata.h')
0 files changed, 0 insertions, 0 deletions