diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 18:09:58 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-24 18:09:58 +0400 |
commit | d69238e991844cb0e9407c26e64dd7a551aa5bab (patch) | |
tree | a6169232d84d75370f66dcf011f8d7ee45594f8a /libavformat/mtv.c | |
parent | c6664242e0700ea0bc10109c7e84c3f9cf7fb9ae (diff) | |
parent | f3298f12997eb4b7ad203766f768f92e3dd72a2a (diff) |
Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a'
* commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a':
Return proper error code after av_log_ask_for_sample()
configure: cosmetics: Separate hwaccel dependencies from decoders/encoders
oggdec: check memory allocation
Conflicts:
configure
libavcodec/pictordec.c
libavformat/anm.c
libavformat/oggdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mtv.c')
-rw-r--r-- | libavformat/mtv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mtv.c b/libavformat/mtv.c index 622a9b8f5e..5f39ec5368 100644 --- a/libavformat/mtv.c +++ b/libavformat/mtv.c @@ -115,7 +115,7 @@ static int mtv_read_header(AVFormatContext *s) if (audio_subsegments == 0) { av_log_ask_for_sample(s, "MTV files without audio are not supported\n"); - return AVERROR_INVALIDDATA; + return AVERROR_PATCHWELCOME; } mtv->full_segment_size = |