[FFmpeg-cvslog] r22301 - in trunk/libavformat: avformat.h utils.c
alexc
subversion
Mon Mar 8 01:00:50 CET 2010
Author: alexc
Date: Mon Mar 8 01:00:50 2010
New Revision: 22301
Log:
av_find_stream_info(): Add a workaround for backwards compatible HE-AAC signaling.
The sample rate, frame size, and channel count from the container are
not reliable when backwards compatible signaling is used.
Modified:
trunk/libavformat/avformat.h
trunk/libavformat/utils.c
Modified: trunk/libavformat/avformat.h
==============================================================================
--- trunk/libavformat/avformat.h Mon Mar 8 00:53:47 2010 (r22300)
+++ trunk/libavformat/avformat.h Mon Mar 8 01:00:50 2010 (r22301)
@@ -22,7 +22,7 @@
#define AVFORMAT_AVFORMAT_H
#define LIBAVFORMAT_VERSION_MAJOR 52
-#define LIBAVFORMAT_VERSION_MINOR 54
+#define LIBAVFORMAT_VERSION_MINOR 55
#define LIBAVFORMAT_VERSION_MICRO 0
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c Mon Mar 8 00:53:47 2010 (r22300)
+++ trunk/libavformat/utils.c Mon Mar 8 01:00:50 2010 (r22301)
@@ -2116,6 +2116,11 @@ int av_find_stream_info(AVFormatContext
for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i];
+ if (st->codec->codec_id == CODEC_ID_AAC) {
+ st->codec->sample_rate = 0;
+ st->codec->frame_size = 0;
+ st->codec->channels = 0;
+ }
if(st->codec->codec_type == CODEC_TYPE_VIDEO){
/* if(!st->time_base.num)
st->time_base= */
More information about the ffmpeg-cvslog
mailing list