diff options
| author | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
|---|---|---|
| committer | Tim Redfern <tim@eclectronics.org> | 2013-12-29 12:19:38 +0000 |
| commit | f7813a5324be39d13ab536c245d15dfc602a7849 (patch) | |
| tree | fad99148b88823d34a5df2f0a25881a002eb291b /ffmpeg/libavcodec/dnxhddec.c | |
| parent | b7a5a477b8ff4d4e3028b9dfb9a9df0a41463f92 (diff) | |
basic type mechanism working
Diffstat (limited to 'ffmpeg/libavcodec/dnxhddec.c')
| -rw-r--r-- | ffmpeg/libavcodec/dnxhddec.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/ffmpeg/libavcodec/dnxhddec.c b/ffmpeg/libavcodec/dnxhddec.c index 11bed00..42775df 100644 --- a/ffmpeg/libavcodec/dnxhddec.c +++ b/ffmpeg/libavcodec/dnxhddec.c @@ -22,9 +22,6 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -//#define TRACE -//#define DEBUG - #include "libavutil/imgutils.h" #include "avcodec.h" #include "get_bits.h" @@ -380,9 +377,9 @@ static int dnxhd_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, first_field = 1; } - if (av_image_check_size(ctx->width, ctx->height, 0, avctx)) - return -1; - avcodec_set_dimensions(avctx, ctx->width, ctx->height); + ret = ff_set_dimensions(avctx, ctx->width, ctx->height); + if (ret < 0) + return ret; if (first_field) { if ((ret = ff_thread_get_buffer(avctx, &frame, 0)) < 0) @@ -416,6 +413,7 @@ static av_cold int dnxhd_decode_close(AVCodecContext *avctx) AVCodec ff_dnxhd_decoder = { .name = "dnxhd", + .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_DNXHD, .priv_data_size = sizeof(DNXHDContext), @@ -423,5 +421,4 @@ AVCodec ff_dnxhd_decoder = { .close = dnxhd_decode_close, .decode = dnxhd_decode_frame, .capabilities = CODEC_CAP_DR1 | CODEC_CAP_FRAME_THREADS, - .long_name = NULL_IF_CONFIG_SMALL("VC3/DNxHD"), }; |