summaryrefslogtreecommitdiff
path: root/libavformat/iff.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-13 01:56:33 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-03-13 01:56:33 +0100
commitb25a265a5c921d2d223a8aeff2f918894d515934 (patch)
tree480f9648f685220520a344ac293f66e307abfc5c /libavformat/iff.c
parent2d38081b4f65f23077cb1b27f2d08c82c45afa05 (diff)
parentbd3e07c82ae558c2cc3616115161827630826ec1 (diff)
downloadffmpeg-b25a265a5c921d2d223a8aeff2f918894d515934.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: pcm-mpeg: convert to bytestream2 API Revert "h264: clear trailing bits in partially parsed NAL units" remove iwmmxt optimizations mimic: do not continue if swap_buf_size is 0 mimic: convert to bytestream2 API frwu: use MKTAG to check marker instead of AV_RL32 txd: port to bytestream2 API c93: convert to bytestream2 API iff: make .long_name more descriptive FATE: add test for cdxl demuxer rtsp: Fix a typo Conflicts: libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/dsputil_iwmmxt_rnd_template.c libavcodec/arm/mpegvideo_iwmmxt.c libavcodec/c93.c libavcodec/txd.c libavutil/arm/cpu.c tests/fate/demux.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/iff.c')
-rw-r--r--libavformat/iff.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/iff.c b/libavformat/iff.c
index 7473c182b0..1890800cf2 100644
--- a/libavformat/iff.c
+++ b/libavformat/iff.c
@@ -385,7 +385,7 @@ static int iff_read_packet(AVFormatContext *s,
AVInputFormat ff_iff_demuxer = {
.name = "IFF",
- .long_name = NULL_IF_CONFIG_SMALL("IFF format"),
+ .long_name = NULL_IF_CONFIG_SMALL("Interchange File Format"),
.priv_data_size = sizeof(IffDemuxContext),
.read_probe = iff_probe,
.read_header = iff_read_header,