generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'd80811c94e068085aab797f9ba35790529126f85'

Browse Source 
* commit 'd80811c94e068085aab797f9ba35790529126f85':
  riff: Use the correct logging context

Conflicts:
	libavformat/asfdec_o.c
	libavformat/avidec.c
	libavformat/dxa.c
	libavformat/matroskadec.c
	libavformat/mov.c
	libavformat/riff.h
	libavformat/riffdec.c
	libavformat/wavdec.c
	libavformat/wtvdec.c
	libavformat/xwma.c

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ba77fb61f7)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
This commit is contained in:
Michael Niedermayer
2015-07-12 15:21:15 +02:00
committed by Andreas Cadhalpun
parent ba944121e2
commit 68c0d66d4d
12 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/act.c
View File

@@ -75,7 +75,7 @@ static int read_header(AVFormatContext *s)
avio_skip(pb, 16); avio_skip(pb, 16);
size=avio_rl32(pb); size=avio_rl32(pb);
ff_get_wav_header(pb, st->codec, size); ff_get_wav_header(s, pb, st->codec, size);
/* /*
8000Hz (Fine-rec) file format has 10 bytes long 8000Hz (Fine-rec) file format has 10 bytes long

2
libavformat/asfdec.c
View File

@@ -423,7 +423,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
st->codec->codec_type = type; st->codec->codec_type = type;
if (type == AVMEDIA_TYPE_AUDIO) { if (type == AVMEDIA_TYPE_AUDIO) {
int ret = ff_get_wav_header(pb, st->codec, type_specific_size); int ret = ff_get_wav_header(s, pb, st->codec, type_specific_size);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (is_dvr_ms_audio) { if (is_dvr_ms_audio) {

2
libavformat/avidec.c
View File

@@ -811,7 +811,7 @@ static int avi_read_header(AVFormatContext *s)
// avio_skip(pb, size - 5 * 4); // avio_skip(pb, size - 5 * 4);
break; break;
case AVMEDIA_TYPE_AUDIO: case AVMEDIA_TYPE_AUDIO:
ret = ff_get_wav_header(pb, st->codec, size); ret = ff_get_wav_header(s, pb, st->codec, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
ast->dshow_block_align = st->codec->block_align; ast->dshow_block_align = st->codec->block_align;

2
libavformat/dxa.c
View File

@@ -106,7 +106,7 @@ static int dxa_read_header(AVFormatContext *s)
ast = avformat_new_stream(s, NULL); ast = avformat_new_stream(s, NULL);
if (!ast) if (!ast)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_get_wav_header(pb, ast->codec, fsize); ret = ff_get_wav_header(s, pb, ast->codec, fsize);
if (ret < 0) if (ret < 0)
return ret; return ret;
if (ast->codec->sample_rate > 0) if (ast->codec->sample_rate > 0)

2
libavformat/matroskadec.c
View File

@@ -1714,7 +1714,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
ffio_init_context(&b, track->codec_priv.data, ffio_init_context(&b, track->codec_priv.data,
track->codec_priv.size, track->codec_priv.size,
0, NULL, NULL, NULL, NULL); 0, NULL, NULL, NULL, NULL);
ret = ff_get_wav_header(&b, st->codec, track->codec_priv.size); ret = ff_get_wav_header(s, &b, st->codec, track->codec_priv.size);
if (ret < 0) if (ret < 0)
return ret; return ret;
codec_id = st->codec->codec_id; codec_id = st->codec->codec_id;

2
libavformat/mlvdec.c
View File

@@ -142,7 +142,7 @@ static int scan_file(AVFormatContext *avctx, AVStream *vst, AVStream *ast, int f
vst->codec->codec_tag = MKTAG('B', 'I', 'T', 16); vst->codec->codec_tag = MKTAG('B', 'I', 'T', 16);
size -= 164; size -= 164;
} else if (ast && type == MKTAG('W', 'A', 'V', 'I') && size >= 16) { } else if (ast && type == MKTAG('W', 'A', 'V', 'I') && size >= 16) {
ret = ff_get_wav_header(pb, ast->codec, 16); ret = ff_get_wav_header(avctx, pb, ast->codec, 16);
if (ret < 0) if (ret < 0)
return ret; return ret;
size -= 16; size -= 16;

2
libavformat/mov.c
View File

@@ -696,7 +696,7 @@ static int mov_read_wfex(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0; return 0;
st = c->fc->streams[c->fc->nb_streams-1]; st = c->fc->streams[c->fc->nb_streams-1];
if (ff_get_wav_header(pb, st->codec, atom.size) < 0) { if (ff_get_wav_header(c->fc, pb, st->codec, atom.size) < 0) {
av_log(c->fc, AV_LOG_WARNING, "get_wav_header failed\n"); av_log(c->fc, AV_LOG_WARNING, "get_wav_header failed\n");
} }

2
libavformat/riff.h
View File

@@ -62,7 +62,7 @@ void ff_put_bmp_header(AVIOContext *pb, AVCodecContext *enc, const AVCodecTag *t
int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc, int flags); int ff_put_wav_header(AVIOContext *pb, AVCodecContext *enc, int flags);
enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps); enum AVCodecID ff_wav_codec_get_id(unsigned int tag, int bps);
int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size); int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb, AVCodecContext *codec, int size);
extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags() extern const AVCodecTag ff_codec_bmp_tags[]; // exposed through avformat_get_riff_video_tags()
extern const AVCodecTag ff_codec_wav_tags[]; extern const AVCodecTag ff_codec_wav_tags[];

5
libavformat/riffdec.c
View File

@@ -80,7 +80,8 @@ static void parse_waveformatex(AVIOContext *pb, AVCodecContext *c)
} }
} }
int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size) int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
AVCodecContext *codec, int size)
{ {
int id; int id;
@@ -122,7 +123,7 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
avio_skip(pb, size); avio_skip(pb, size);
} }
if (codec->sample_rate <= 0) { if (codec->sample_rate <= 0) {
av_log(NULL, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,
"Invalid sample rate: %d\n", codec->sample_rate); "Invalid sample rate: %d\n", codec->sample_rate);
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

4
libavformat/wavdec.c
View File

@@ -128,7 +128,7 @@ static int wav_parse_fmt_tag(AVFormatContext *s, int64_t size, AVStream **st)
if (!*st) if (!*st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_get_wav_header(pb, (*st)->codec, size); ret = ff_get_wav_header(s, pb, (*st)->codec, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
handle_stream_probing(*st); handle_stream_probing(*st);
@@ -662,7 +662,7 @@ static int w64_read_header(AVFormatContext *s)
if (!memcmp(guid, ff_w64_guid_fmt, 16)) { if (!memcmp(guid, ff_w64_guid_fmt, 16)) {
/* subtract chunk header size - normal wav file doesn't count it */ /* subtract chunk header size - normal wav file doesn't count it */
ret = ff_get_wav_header(pb, st->codec, size - 24); ret = ff_get_wav_header(s, pb, st->codec, size - 24);
if (ret < 0) if (ret < 0)
return ret; return ret;
avio_skip(pb, FFALIGN(size, INT64_C(8)) - size); avio_skip(pb, FFALIGN(size, INT64_C(8)) - size);

2
libavformat/wtvdec.c
View File

@@ -663,7 +663,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid,
if (!st) if (!st)
return NULL; return NULL;
if (!ff_guidcmp(formattype, ff_format_waveformatex)) { if (!ff_guidcmp(formattype, ff_format_waveformatex)) {
int ret = ff_get_wav_header(pb, st->codec, size); int ret = ff_get_wav_header(s, pb, st->codec, size);
if (ret < 0) if (ret < 0)
return NULL; return NULL;
} else { } else {

2
libavformat/xwma.c
View File

@@ -75,7 +75,7 @@ static int xwma_read_header(AVFormatContext *s)
if (!st) if (!st)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
ret = ff_get_wav_header(pb, st->codec, size); ret = ff_get_wav_header(s, pb, st->codec, size);
if (ret < 0) if (ret < 0)
return ret; return ret;
st->need_parsing = AVSTREAM_PARSE_NONE; st->need_parsing = AVSTREAM_PARSE_NONE;