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 /libavformat/internal.h | |
| 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 'libavformat/internal.h')
| -rw-r--r-- | libavformat/internal.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavformat/internal.h b/libavformat/internal.h index 36ee4c0be9..8e53cc54a1 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -357,9 +357,10 @@ enum AVCodecID ff_get_pcm_codec_id(int bps, int flt, int be, int sflags); AVRational ff_choose_timebase(AVFormatContext *s, AVStream *st, int min_precission); /** - * Generate standard extradata for AVC-Intra based on width/height and field order. + * Generate standard extradata for AVC-Intra based on width/height and field + * order. */ -void ff_generate_avci_extradata(AVStream *st); +int ff_generate_avci_extradata(AVStream *st); /** * Allocate extradata with additional FF_INPUT_BUFFER_PADDING_SIZE at end |