diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-30 14:49:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-30 14:49:49 +0100 |
| commit | afb4bc3d291f4cc6b67b635305d30a097cb2a82d (patch) | |
| tree | abf13c6844cf4a0921b6fb91edd607717c883829 /ffmpeg_filter.c | |
| parent | 91f359292a52b7acf3785ea4c399b20d8fbd24e5 (diff) | |
| parent | 61d36761efda663c5ce07a5ec13659431b08f3c2 (diff) | |
| download | ffmpeg-afb4bc3d291f4cc6b67b635305d30a097cb2a82d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
movenc: Simplify code by using avio_wb24
bfin: unbreak compilation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions