summaryrefslogtreecommitdiffstats
path: root/libavcodec/svq3.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-03-21 23:13:25 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 23:13:25 +0100
commita6cb0534e2b5e91c119c77165bc65a6ff14e649b (patch)
tree4bb9972d8b24a155ba446cd13b4834c673026944 /libavcodec/svq3.c
parentd8151a7e944aea52d167571badc247c8d9972847 (diff)
parentb53569e0681ff7bc99103ab4c961dbac3cc0fce6 (diff)
downloadffmpeg-streaming-a6cb0534e2b5e91c119c77165bc65a6ff14e649b.zip
ffmpeg-streaming-a6cb0534e2b5e91c119c77165bc65a6ff14e649b.tar.gz
Merge commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6'
* commit 'b53569e0681ff7bc99103ab4c961dbac3cc0fce6': h264_cabac: remove now unnecessary H264Context function parameters Conflicts: libavcodec/h264_cabac.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/svq3.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud