Showing the changes to libavcodec (2 of 2 files). Show all
Unified · Split
| @@ -253,8 +253,6 @@ fail: · 252 unmodified lines | ||
| 253 | 253 | void ff_mpeg_unref_picture(AVCodecContext *avctx, Picture *pic) |
| 254 | 254 | { |
| 255 | 255 | pic->tf.f = pic->f; |
| 256 | − /* WM Image / Screen codecs allocate internal buffers with different | |
| 257 | − * dimensions / colorspaces; ignore user-defined callbacks for these. */ | |
| 258 | 256 | if (avctx->codec_id != AV_CODEC_ID_WMV3IMAGE && |
| 259 | 257 | avctx->codec_id != AV_CODEC_ID_VC1IMAGE && |
| 260 | 258 | avctx->codec_id != AV_CODEC_ID_MSS2) |
| @@ -242,6 +242,8 @@ static int alloc_picture(MpegEncContext *s, Picture *pic) · 241 unmodified lines | ||
| 242 | 242 | |
| 243 | 243 | pic->tf.f = pic->f; |
| 244 | 244 | |
| 245 | + /* WM Image / Screen codecs allocate internal buffers with different | |
| 246 | + * dimensions / colorspaces; ignore user-defined callbacks for these. */ | |
| 245 | 247 | if (avctx->codec_id != AV_CODEC_ID_WMV3IMAGE && |
| 246 | 248 | avctx->codec_id != AV_CODEC_ID_VC1IMAGE && |
| 247 | 249 | avctx->codec_id != AV_CODEC_ID_MSS2) { |