diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 20:56:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 21:04:44 +0100 |
| commit | 074bae745d9d99d94ef99f870d0a6bb50d1e7a0b (patch) | |
| tree | e340d9c145fd783a87b7574ebd6211c13a832d19 /libavcodec/h264.c | |
| parent | 0f969c00c6a32ea66da00e3b3f70fc62933968d1 (diff) | |
| parent | ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878 (diff) | |
| download | ffmpeg-074bae745d9d99d94ef99f870d0a6bb50d1e7a0b.tar.gz | |
Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'
* commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878':
lavf: improve support for AVC-Intra files.
Conflicts:
libavformat/internal.h
libavformat/isom.c
libavformat/mxfdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
0 files changed, 0 insertions, 0 deletions