diff mbox

[FFmpeg-devel] mov: Read multiple stsd from DV

Message ID 20161108033205.69369-1-vittorio.giovara@gmail.com
State Accepted
Commit a765ba647d3d5ecb7270011693cb5b171f9afd01
Headers show

Commit Message

Vittorio Giovara Nov. 8, 2016, 3:32 a.m. UTC
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
---
Sorry, I can't share the sample or add a fate for this.
Please CC.
Vittorio

 libavformat/mov.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Michael Niedermayer Nov. 8, 2016, 1:06 p.m. UTC | #1
On Mon, Nov 07, 2016 at 10:32:05PM -0500, Vittorio Giovara wrote:
> Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
> ---
> Sorry, I can't share the sample or add a fate for this.
> Please CC.
> Vittorio
> 
>  libavformat/mov.c | 2 ++
>  1 file changed, 2 insertions(+)

applied

thx

[..]
diff mbox

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index e283034..a2a688b 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2219,6 +2219,8 @@  static int mov_skip_multiple_stsd(MOVContext *c, AVIOContext *pb,
          (codec_tag != format &&
           // prores is allowed to have differing data format and codec tag
           codec_tag != AV_RL32("apcn") && codec_tag != AV_RL32("apch") &&
+          // so is dv (sigh)
+          codec_tag != AV_RL32("dvpp") && codec_tag != AV_RL32("dvcp") &&
           (c->fc->video_codec_id ? video_codec_id != c->fc->video_codec_id
                                  : codec_tag != MKTAG('j','p','e','g')))) {
         /* Multiple fourcc, we skip JPEG. This is not correct, we should