aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-25 10:35:06 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-04-25 10:35:06 +0000
commitcc326d2bf3b4db857c077eaf42e05c2b54d3daf7 (patch)
tree92bea1c8b59be4c2321dfeb5182cfa136e556db7
parent07a47ae2a3f7bcfea25828628e8b1df44dd5a1cd (diff)
downloadffmpeg-cc326d2bf3b4db857c077eaf42e05c2b54d3daf7.tar.gz
set gsm default frame size and bytes per frame, needed by old qt format, fix sample-gsm-8000.mov
Originally committed as revision 12950 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mov.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index ab5953c4a6..0e3983242a 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -856,6 +856,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
sc->samples_per_frame = 64;
sc->bytes_per_frame = 34*st->codec->channels;
break;
+ case CODEC_ID_GSM:
+ sc->samples_per_frame = 160;
+ sc->bytes_per_frame = 33;
+ break;
default:
break;
}