[FFmpeg-cvslog] avcodec/cfhd: Fixes cfhd_odd.mov which has a resolution of 496x241

Kieran Kunhya git at videolan.org
Sun Mar 6 13:55:28 CET 2016


ffmpeg | branch: master | Kieran Kunhya <kieran at kunhya.com> | Sat Mar  5 18:06:16 2016 +0000| [247fe3e494ca0f31c8ea56f54b11cf947acc4089] | committer: Kieran Kunhya

avcodec/cfhd: Fixes cfhd_odd.mov which has a resolution of 496x241

In this case container width/height is better however.
Thanks to koda for the sample

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=247fe3e494ca0f31c8ea56f54b11cf947acc4089
---

 libavcodec/cfhd.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c
index e37bef0..98f16d3 100644
--- a/libavcodec/cfhd.c
+++ b/libavcodec/cfhd.c
@@ -467,6 +467,9 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
                 coeff_data += lowpass_width;
             }
 
+            /* Align to mod-4 position to continue reading tags */
+            bytestream2_seek(&gb, bytestream2_tell(&gb) & 3, SEEK_CUR);
+
             /* Copy last line of coefficients if odd height */
             if (lowpass_height & 1) {
                 memcpy(&coeff_data[lowpass_height * lowpass_width],



More information about the ffmpeg-cvslog mailing list