diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:03:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 14:03:22 +0100 |
| commit | 849f015406e77921a2adbe05e58b0e65cbf035c5 (patch) | |
| tree | 05a8b30cd52af9bbaf0ca6be59a2aae079600077 /libavcodec | |
| parent | a62fced394825101b202a8bc6055e4932b371089 (diff) | |
| parent | a4472ac01e86f9fae5adb9034f2777b86a9c5480 (diff) | |
Merge commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480'
* commit 'a4472ac01e86f9fae5adb9034f2777b86a9c5480':
Add informative messages to av_log_ask_for_sample calls lacking them
anm: Get rid of some very silly goto statements
Conflicts:
libavformat/anm.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 2e7204d933..fbca611abf 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -3484,9 +3484,8 @@ static int decode_slice_header(H264Context *h, H264Context *h0) h->droppable = last_pic_droppable; return AVERROR_INVALIDDATA; } else if (last_pic_droppable != h->droppable) { - av_log(h->avctx, AV_LOG_ERROR, - "Cannot combine reference and non-reference fields in the same frame\n"); - av_log_ask_for_sample(h->avctx, NULL); + av_log_ask_for_sample(h->avctx, + "Found reference and non-reference fields in the same frame.\n"); h->picture_structure = last_pic_structure; h->droppable = last_pic_droppable; return AVERROR_PATCHWELCOME; |