Mercurial > mplayer.hg
comparison libmpcodecs/vd_ffmpeg.c @ 35715:8517826b0dbd
Replace CODEC_IDs their modern AV_-prefixed counterparts.
author | diego |
---|---|
date | Mon, 21 Jan 2013 19:44:53 +0000 |
parents | 4ba6b8d3197e |
children | a11fa641a711 |
comparison
equal
deleted
inserted
replaced
35714:fc36990b6ae5 | 35715:8517826b0dbd |
---|---|
245 } | 245 } |
246 | 246 |
247 if(use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) | 247 if(use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) |
248 ctx->do_slices=1; | 248 ctx->do_slices=1; |
249 | 249 |
250 if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_VP8) | 250 if (lavc_codec->capabilities & CODEC_CAP_DR1 && !do_vis_debug && |
251 lavc_codec->id != AV_CODEC_ID_INTERPLAY_VIDEO && | |
252 lavc_codec->id != AV_CODEC_ID_VP8) | |
251 ctx->do_dr1=1; | 253 ctx->do_dr1=1; |
252 // TODO: fix and enable again. This currently causes issues when using filters | 254 // TODO: fix and enable again. This currently causes issues when using filters |
253 // and seeking, usually failing with the "Ran out of numbered images" message, | 255 // and seeking, usually failing with the "Ran out of numbered images" message, |
254 // but bugzilla #2118 might be related as well. | 256 // but bugzilla #2118 might be related as well. |
255 //ctx->nonref_dr = lavc_codec->id == CODEC_ID_H264; | 257 //ctx->nonref_dr = lavc_codec->id == AV_CODEC_ID_H264; |
256 ctx->ip_count= ctx->b_count= 0; | 258 ctx->ip_count= ctx->b_count= 0; |
257 | 259 |
258 ctx->pic = avcodec_alloc_frame(); | 260 ctx->pic = avcodec_alloc_frame(); |
259 ctx->avctx = avcodec_alloc_context3(lavc_codec); | 261 ctx->avctx = avcodec_alloc_context3(lavc_codec); |
260 avctx = ctx->avctx; | 262 avctx = ctx->avctx; |
895 break; | 897 break; |
896 } | 898 } |
897 //-- | 899 //-- |
898 | 900 |
899 if(!got_picture) { | 901 if(!got_picture) { |
900 if (avctx->codec->id == CODEC_ID_H264 && | 902 if (avctx->codec->id == AV_CODEC_ID_H264 && |
901 skip_frame <= AVDISCARD_DEFAULT) | 903 skip_frame <= AVDISCARD_DEFAULT) |
902 return &mpi_no_picture; // H.264 first field only | 904 return &mpi_no_picture; // H.264 first field only |
903 else | 905 else |
904 return NULL; // skipped image | 906 return NULL; // skipped image |
905 } | 907 } |