diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:36:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:36:35 +0100 |
| commit | f9d5bdd0f6526e852ec37528c9b5f97beb71ef07 (patch) | |
| tree | 3fce75f86b6fc11866615307a7d6bfc0498cc5b1 /libavcodec/flicvideo.c | |
| parent | 4adc8a29a0565cb35815eeb8e693b47dcaf890ce (diff) | |
| parent | 1a31dff9370b4732c91df5cb1ca4b39f2cb3050e (diff) | |
| download | ffmpeg-f9d5bdd0f6526e852ec37528c9b5f97beb71ef07.tar.gz | |
Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'
* commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e':
loco: return meaningful error codes.
flicvideo: return meaningful error codes.
vcr1: remove disabled encoder stub
Conflicts:
libavcodec/flicvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flicvideo.c')
| -rw-r--r-- | libavcodec/flicvideo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index eb70249ef7..9e35f48e4c 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -787,7 +787,7 @@ static int flic_decode_frame(AVCodecContext *avctx, /* the finite set of possibilites allowable by here. */ /* But in case we do, just error out. */ av_log(avctx, AV_LOG_ERROR, "Unknown FLC format, my science cannot explain how this happened.\n"); - return AVERROR_INVALIDDATA; + return AVERROR_BUG; } |