diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-10 17:37:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-10 17:37:51 +0100 |
| commit | 78e150c5e9bb5a628d00562ade1fd4bf3635fc4d (patch) | |
| tree | 7d0ec6dc63bd5a309821e9198d254a14f93fd87b /libavcodec/indeo3data.h | |
| parent | 2fbc759d08cae97f9361e464a685a149c9d12c72 (diff) | |
| parent | 08303d774132775d49d4ba767092de5d426f089d (diff) | |
| download | ffmpeg-78e150c5e9bb5a628d00562ade1fd4bf3635fc4d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
hwaccel: Simplify ff_find_hwaccel
Conflicts:
libavcodec/mpeg12dec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/indeo3data.h')
0 files changed, 0 insertions, 0 deletions