projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fbc8c59
)
avformat: do not require frame_size in avformat_find_stream_info() for CELT
author
Justin Ruggles
<justin.ruggles@gmail.com>
Mon, 27 Feb 2012 07:46:03 +0000
(
02:46
-0500)
committer
Justin Ruggles
<justin.ruggles@gmail.com>
Mon, 5 Mar 2012 18:08:16 +0000
(13:08 -0500)
In Ogg/CELT, frame_size is found in the same place as the sample_rate and
channels, so we do not need to force the frame_size to be parsed.
libavformat/utils.c
patch
|
blob
|
history
diff --git
a/libavformat/utils.c
b/libavformat/utils.c
index 4677a11d320dfa97da229e3db54903d3e7191a4b..7e66962b9a5b9d8dd85dd5b02e55055e109f4933 100644
(file)
--- a/
libavformat/utils.c
+++ b/
libavformat/utils.c
@@
-2018,9
+2018,6
@@
static int has_codec_parameters(AVCodecContext *avctx)
switch (avctx->codec_type) {
case AVMEDIA_TYPE_AUDIO:
val = avctx->sample_rate && avctx->channels && avctx->sample_fmt != AV_SAMPLE_FMT_NONE;
- if (!avctx->frame_size &&
- avctx->codec_id == CODEC_ID_CELT))
- return 0;
break;
case AVMEDIA_TYPE_VIDEO:
val = avctx->width && avctx->pix_fmt != PIX_FMT_NONE;