aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/jvdec.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-02-16 21:14:00 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-02-16 23:30:09 +0100
commitb7fe35c9e50e1701274364adf7280bf4a02b092b (patch)
tree05d5ffb039ce76bbc782d36704bdf8b135df50ce /libavformat/jvdec.c
parentddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (diff)
parent2c541554076cc8a72e7145d4da30389ca763f32f (diff)
downloadffmpeg-b7fe35c9e50e1701274364adf7280bf4a02b092b.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: h264: deMpegEncContextize Conflicts: libavcodec/dxva2_h264.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_mb_template.c libavcodec/h264_parser.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264_sei.c libavcodec/svq3.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/jvdec.c')
0 files changed, 0 insertions, 0 deletions