diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 03:13:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 03:13:54 +0100 |
| commit | adc09a353c5ff467fdc924373e2ee1faf703b3b3 (patch) | |
| tree | d4568558c2c9e6dc442aff39941d3147b1df63f6 /libavfilter/dualinput.c | |
| parent | 9b9f64fe315ca7a7a8b9517ab5c082ecb8b698be (diff) | |
| parent | a3a55645f09fd4b5e491ed29ae4bddda4c2d41a5 (diff) | |
| download | ffmpeg-adc09a353c5ff467fdc924373e2ee1faf703b3b3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: remove disabled bfin asm
Conflicts:
libavcodec/bfin/mpegvideo_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/dualinput.c')
0 files changed, 0 insertions, 0 deletions