diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:39:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-30 01:40:54 +0200 |
| commit | b0387edd5e766b1032f946d6cdb35b765bb45435 (patch) | |
| tree | dd3ca8577a8d3b05efee8b1214a80f845ddeb47f /libavformat/g723_1.c | |
| parent | 8619362ff1de6605ffe6da8a42bdfe4fb7be75c1 (diff) | |
| parent | f919cc7df6ab844bc12f89fe7bef4fb915a47725 (diff) | |
| download | ffmpeg-b0387edd5e766b1032f946d6cdb35b765bb45435.tar.gz | |
Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725'
* commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725':
fate: fix acodec/vsynth tests for make 3.81
pcm_mpeg: fix number of consumed bytes to include the header.
avfilter: include required header file avfilter.h in video.h
x86: Avoid movs on BUTTERFLYPS when in AVX mode
x86: use new schema for ASM macros
fate: convert codec-regression.sh to makefile rules
fate: allow tests to specify unit size for psnr comparison
fate: teach videogen/rotozoom to output a single raw video stream
http: Add support for reusing the http socket for subsequent requests
http: Add support for using persistent connections
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/g723_1.c')
| -rw-r--r-- | libavformat/g723_1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/g723_1.c b/libavformat/g723_1.c index a12a47a1ae..1e0fd07857 100644 --- a/libavformat/g723_1.c +++ b/libavformat/g723_1.c @@ -77,6 +77,6 @@ AVInputFormat ff_g723_1_demuxer = { .long_name = NULL_IF_CONFIG_SMALL("G.723.1 format"), .read_header = g723_1_init, .read_packet = g723_1_read_packet, - .extensions = "tco,rco", + .extensions = "tco,rco,g723_1", .flags = AVFMT_GENERIC_INDEX }; |