| Message ID | GV1P250MB07370682E1A15318CD11EAC98F032@GV1P250MB0737.EURP250.PROD.OUTLOOK.COM |
|---|---|
| State | Accepted |
| Commit | 17414abb69b44675fd9964069f948a4d48b1ec5e |
| Headers | show |
| Series | [FFmpeg-devel,01/15] avcodec/mpegvideo_enc: Don't update current_picture unnecessarily | expand |
| Context | Check | Description |
|---|---|---|
| andriy/commit_msg_x86 | warning | The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ". |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index 4b01c54147..a346839902 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -483,7 +483,7 @@ static int h264_frame_start(H264Context *h) if (!ff_thread_can_start_frame(h->avctx)) { av_log(h->avctx, AV_LOG_ERROR, "Attempt to start a frame outside SETUP state\n"); - return -1; + return AVERROR_BUG; } release_unused_pictures(h, 1); diff --git a/libavcodec/mpegvideo_dec.c b/libavcodec/mpegvideo_dec.c index d337a6565b..4353f1fd68 100644 --- a/libavcodec/mpegvideo_dec.c +++ b/libavcodec/mpegvideo_dec.c @@ -328,7 +328,7 @@ int ff_mpv_frame_start(MpegEncContext *s, AVCodecContext *avctx) if (!ff_thread_can_start_frame(avctx)) { av_log(avctx, AV_LOG_ERROR, "Attempt to start a frame outside SETUP state\n"); - return -1; + return AVERROR_BUG; } /* mark & release old frames */
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com> --- libavcodec/h264_slice.c | 2 +- libavcodec/mpegvideo_dec.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)