diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 13:45:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-30 13:52:03 +0100 |
| commit | cd37963684d8ee9819af15ccebe09d84839101dd (patch) | |
| tree | 33c99132f79f095301b4e453c40f0b77005f5b1d /libavformat/nut.c | |
| parent | 60e957476e338a200501e0bdad40b7bf0076b268 (diff) | |
| parent | 381dc1a5ec0925b281c573457c413ae643567086 (diff) | |
| download | ffmpeg-cd37963684d8ee9819af15ccebe09d84839101dd.tar.gz | |
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
* commit '381dc1a5ec0925b281c573457c413ae643567086':
fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
fate: Add shorthands for acodec PCM and ADPCM tests
avconv: Drop unused function argument from do_video_stats()
cmdutils: Conditionally compile libswscale-related bits
aacenc: Drop some unused function arguments
rtsp: Avoid a cast when calling strtol
nut: support textual data
nutenc: verbosely report unsupported negative pts
Conflicts:
cmdutils.c
ffmpeg.c
libavformat/nut.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/nut.c')
| -rw-r--r-- | libavformat/nut.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavformat/nut.c b/libavformat/nut.c index 51e4d38394..eaf32e73c5 100644 --- a/libavformat/nut.c +++ b/libavformat/nut.c @@ -34,6 +34,11 @@ const AVCodecTag ff_nut_subtitle_tags[] = { { AV_CODEC_ID_NONE , 0 } }; +const AVCodecTag ff_nut_data_tags[] = { + { AV_CODEC_ID_TEXT , MKTAG('U', 'T', 'F', '8') }, + { AV_CODEC_ID_NONE , 0 } +}; + const AVCodecTag ff_nut_video_tags[] = { { AV_CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 15 ) }, { AV_CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 15 ) }, @@ -140,7 +145,7 @@ const AVCodecTag ff_nut_audio_tags[] = { const AVCodecTag * const ff_nut_codec_tags[] = { ff_nut_video_tags, ff_nut_subtitle_tags, - ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_audio_tags, 0 + ff_codec_bmp_tags, ff_codec_wav_tags, ff_nut_audio_tags, ff_nut_data_tags, 0 }; void ff_nut_reset_ts(NUTContext *nut, AVRational time_base, int64_t val){ |