diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 14:04:43 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-28 14:24:27 +0100 |
| commit | c73fcc8de3e314304819eed89216727a20e5e8a0 (patch) | |
| tree | badd72ed694f9712c3cfdc92bac9f88f97e6b106 /libavformat/yuv4mpeg.c | |
| parent | 8943ad40146d322f5a5bf2bab790d117ec7a4c37 (diff) | |
| parent | 424b1e764263b1493de4c34365ef367ddae856db (diff) | |
| download | ffmpeg-c73fcc8de3e314304819eed89216727a20e5e8a0.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
yuv4mpeg: reject unsupported codecs
nutenc: K&R formatting cosmetics
assdec: fix qsort() callback signature
configure: detect sparc64 automatically
vp8: fix memset() crossing array boundary
h264: fix invalid pointer arithmetic
amrwbdec: fix invalid pointer arithmetic
Conflicts:
libavformat/nutenc.c
libavformat/yuv4mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/yuv4mpeg.c')
| -rw-r--r-- | libavformat/yuv4mpeg.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index cc13eafef1..357b4122c7 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -216,9 +216,8 @@ static int yuv4_write_header(AVFormatContext *s) return AVERROR(EIO); if (s->streams[0]->codec->codec_id != AV_CODEC_ID_RAWVIDEO) { - av_log(s, AV_LOG_ERROR, - "A non-rawvideo stream was selected, but yuv4mpeg only handles rawvideo streams\n"); - return AVERROR(EINVAL); + av_log(s, AV_LOG_ERROR, "ERROR: Only rawvideo supported.\n"); + return AVERROR_INVALIDDATA; } switch (s->streams[0]->codec->pix_fmt) { |