OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0aded6b
)
Support old qclp-in-mov files that do not store bytes_per_frame in the header.
author
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sat, 22 Feb 2014 23:41:53 +0000
(
00:41
+0100)
committer
Carl Eugen Hoyos
<cehoyos@ag.or.at>
Sat, 22 Feb 2014 23:41:53 +0000
(
00:41
+0100)
Fixes ticket #2649.
libavformat/mov.c
patch
|
blob
|
history
diff --git
a/libavformat/mov.c
b/libavformat/mov.c
index
2597ec9
..
b03d017
100644
(file)
--- a/
libavformat/mov.c
+++ b/
libavformat/mov.c
@@
-1536,6
+1536,10
@@
static int mov_finalize_stsd_codec(MOVContext *c, AVIOContext *pb,
// force sample rate for qcelp when not stored in mov
if (st->codec->codec_tag != MKTAG('Q','c','l','p'))
st->codec->sample_rate = 8000;
+ // FIXME: Why is the following needed for some files?
+ sc->samples_per_frame = 160;
+ if (!sc->bytes_per_frame)
+ sc->bytes_per_frame = 35;
break;
case AV_CODEC_ID_AMR_NB:
st->codec->channels = 1;