diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 00:18:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-26 00:24:31 +0200 |
| commit | a822c3bd7974469d3d86abb29c8309238b5986c5 (patch) | |
| tree | 9beaf098967d7bd21babbb6ad7fce08db9611030 /libavformat/electronicarts.c | |
| parent | 62aab839f80512c0ca997a357a237e6d14db86e1 (diff) | |
| parent | 96dca089b19bf55293136277f5b081c56146e10e (diff) | |
| download | ffmpeg-a822c3bd7974469d3d86abb29c8309238b5986c5.tar.gz | |
Merge commit '96dca089b19bf55293136277f5b081c56146e10e'
* commit '96dca089b19bf55293136277f5b081c56146e10e':
qsvdec: move qsv_process_data() from qsvdec_h264 to the common code
Conflicts:
libavcodec/qsvdec.c
libavcodec/qsvdec_h264.c
No change as the parser code has been removed
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/electronicarts.c')
0 files changed, 0 insertions, 0 deletions