[FFmpeg-cvslog] Merge commit 'd80811c94e068085aab797f9ba35790529126f85'
Michael Niedermayer
git at videolan.org
Thu Nov 26 01:54:07 CET 2015
ffmpeg | branch: release/2.4 | Michael Niedermayer <michael at niedermayer.cc> | Sun Jul 12 15:21:15 2015 +0200| [68c0d66d4d40c57923723222c0da7bb1a949d5c5] | committer: Andreas Cadhalpun
Merge commit 'd80811c94e068085aab797f9ba35790529126f85'
* 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 at niedermayer.cc>
(cherry picked from commit ba77fb61f741d9ab3bd12935527556055b2ffb2e)
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68c0d66d4d40c57923723222c0da7bb1a949d5c5
---
libavformat/act.c | 2 +-
libavformat/asfdec.c | 2 +-
libavformat/avidec.c | 2 +-
libavformat/dxa.c | 2 +-
libavformat/matroskadec.c | 2 +-
libavformat/mlvdec.c | 2 +-
libavformat/mov.c | 2 +-
libavformat/riff.h | 2 +-
libavformat/riffdec.c | 5 +++--
libavformat/wavdec.c | 4 ++--
libavformat/wtvdec.c | 2 +-
libavformat/xwma.c | 2 +-
12 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/libavformat/act.c b/libavformat/act.c
index 3f223d5..faa693c 100644
--- a/libavformat/act.c
+++ b/libavformat/act.c
@@ -75,7 +75,7 @@ static int read_header(AVFormatContext *s)
avio_skip(pb, 16);
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
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 7f7bb4d..c93395c 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -423,7 +423,7 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
st->codec->codec_type = type;
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)
return ret;
if (is_dvr_ms_audio) {
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 417fb74..dd50c2d 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -811,7 +811,7 @@ static int avi_read_header(AVFormatContext *s)
// avio_skip(pb, size - 5 * 4);
break;
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)
return ret;
ast->dshow_block_align = st->codec->block_align;
diff --git a/libavformat/dxa.c b/libavformat/dxa.c
index 6ad1c9f..9ddfbc3 100644
--- a/libavformat/dxa.c
+++ b/libavformat/dxa.c
@@ -106,7 +106,7 @@ static int dxa_read_header(AVFormatContext *s)
ast = avformat_new_stream(s, NULL);
if (!ast)
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)
return ret;
if (ast->codec->sample_rate > 0)
diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 09f7e66..2d64dc0 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1714,7 +1714,7 @@ static int matroska_parse_tracks(AVFormatContext *s)
ffio_init_context(&b, track->codec_priv.data,
track->codec_priv.size,
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)
return ret;
codec_id = st->codec->codec_id;
diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c
index 1855ea4..564e113 100644
--- a/libavformat/mlvdec.c
+++ b/libavformat/mlvdec.c
@@ -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);
size -= 164;
} 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)
return ret;
size -= 16;
diff --git a/libavformat/mov.c b/libavformat/mov.c
index cabba37..3973081 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -696,7 +696,7 @@ static int mov_read_wfex(MOVContext *c, AVIOContext *pb, MOVAtom atom)
return 0;
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");
}
diff --git a/libavformat/riff.h b/libavformat/riff.h
index 88a77b0..e045bb8 100644
--- a/libavformat/riff.h
+++ b/libavformat/riff.h
@@ -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);
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_wav_tags[];
diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index 09fee9d..3462b42 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -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;
@@ -122,7 +123,7 @@ int ff_get_wav_header(AVIOContext *pb, AVCodecContext *codec, int size)
avio_skip(pb, size);
}
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);
return AVERROR_INVALIDDATA;
}
diff --git a/libavformat/wavdec.c b/libavformat/wavdec.c
index 66fd766..cf824d8 100644
--- a/libavformat/wavdec.c
+++ b/libavformat/wavdec.c
@@ -128,7 +128,7 @@ static int wav_parse_fmt_tag(AVFormatContext *s, int64_t size, AVStream **st)
if (!*st)
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)
return ret;
handle_stream_probing(*st);
@@ -662,7 +662,7 @@ static int w64_read_header(AVFormatContext *s)
if (!memcmp(guid, ff_w64_guid_fmt, 16)) {
/* 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)
return ret;
avio_skip(pb, FFALIGN(size, INT64_C(8)) - size);
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index a7334fc..a887f58 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -663,7 +663,7 @@ static AVStream * parse_media_type(AVFormatContext *s, AVStream *st, int sid,
if (!st)
return NULL;
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)
return NULL;
} else {
diff --git a/libavformat/xwma.c b/libavformat/xwma.c
index 5d29d0b..dec1c3e 100644
--- a/libavformat/xwma.c
+++ b/libavformat/xwma.c
@@ -75,7 +75,7 @@ static int xwma_read_header(AVFormatContext *s)
if (!st)
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)
return ret;
st->need_parsing = AVSTREAM_PARSE_NONE;
More information about the ffmpeg-cvslog
mailing list