summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-07-12 13:43:28 +0200
committerAnton Khirnov <anton@khirnov.net>2016-07-25 13:57:02 +0200
commit003a9759db592e471229896f6165a098c52afe2f (patch)
tree8e191ca9538d7b1e73dcd7720e3e32e9cd91f035
parent0c5bd04b8626c82c8e397d7beac5e9709428eeb9 (diff)
cfhd: move initializing the default format to init_frame_defaults()
This is a more appropriate place for it.
-rw-r--r--libavcodec/cfhd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index e14176530d..1e4e0a0c75 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -62,6 +62,7 @@ static void init_plane_defaults(CFHDContext *s)
static void init_frame_defaults(CFHDContext *s)
{
+ s->coded_format = AV_PIX_FMT_YUV422P10;
s->coded_width = 0;
s->coded_height = 0;
s->cropped_height = 0;
@@ -689,7 +690,6 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
int16_t tag;
uint16_t value;
- s->coded_format = AV_PIX_FMT_YUV422P10;
init_frame_defaults(s);
planes = av_pix_fmt_count_planes(s->coded_format);