diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 14:30:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 14:30:21 +0100 |
| commit | 8b7568cc3482e9ee066855c91ca8445dde710cd3 (patch) | |
| tree | f7014eec6b8394937a53dd35d218692bac06d6e2 /libavformat/mxf.h | |
| parent | 131b9c924d6df2b52ca5821a13ddf6fdb49fe76c (diff) | |
| parent | d9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc (diff) | |
| download | ffmpeg-8b7568cc3482e9ee066855c91ca8445dde710cd3.tar.gz | |
Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'
* commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc':
svq3: remove a pointless if()
h264: remove a pointless if()
Conflicts:
libavcodec/h264.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mxf.h')
0 files changed, 0 insertions, 0 deletions