diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 21:14:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-16 23:30:09 +0100 |
| commit | b7fe35c9e50e1701274364adf7280bf4a02b092b (patch) | |
| tree | 05d5ffb039ce76bbc782d36704bdf8b135df50ce /libavcodec/crystalhd.c | |
| parent | ddbbfd95bee4105fcb75f3b7c039b6c08efe36b4 (diff) | |
| parent | 2c541554076cc8a72e7145d4da30389ca763f32f (diff) | |
| download | ffmpeg-b7fe35c9e50e1701274364adf7280bf4a02b092b.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
h264: deMpegEncContextize
Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb_template.c
libavcodec/h264_parser.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c
libavcodec/svq3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/crystalhd.c')
| -rw-r--r-- | libavcodec/crystalhd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/crystalhd.c b/libavcodec/crystalhd.c index 95f1fb6e8d..e2596a29e1 100644 --- a/libavcodec/crystalhd.c +++ b/libavcodec/crystalhd.c @@ -932,8 +932,8 @@ static int decode(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *a } else { av_log(avctx, AV_LOG_VERBOSE, "CrystalHD: parser picture type %d\n", - h->s.picture_structure); - pic_type = h->s.picture_structure; + h->picture_structure); + pic_type = h->picture_structure; } } else { av_log(avctx, AV_LOG_WARNING, |