[FFmpeg-devel] [PATCH 2/7] lavf/mov: Support HEVC demuxing.

[Michael Niedermayer]

On Sat, Oct 12, 2013 at 01:51:44PM -0700, Timothy Gu wrote:
> On Oct 12, 2013 9:45 AM, "Michael Niedermayer" <michaelni at gmx.at> wrote:
> >
> > From: Yusuke Nakamura <muken.the.vfrmaniac at gmail.com>
> >
> > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > ---
> >  libavformat/isom.c |    3 +++
> >  libavformat/mov.c  |   10 +++++++---
> >  2 files changed, 10 insertions(+), 3 deletions(-)
> >
> > diff --git a/libavformat/isom.c b/libavformat/isom.c
> > index ec37228..dbfe4a2 100644
> > --- a/libavformat/isom.c
> > +++ b/libavformat/isom.c
> > @@ -151,6 +151,9 @@ const AVCodecTag ff_codec_movvideo_tags[] = {
> >
> >      { AV_CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
> >
> > +    { AV_CODEC_ID_HEVC, MKTAG('h', 'v', 'c', '1') }, /* HEVC/H.265 which
> indicates parameter sets shall not be in ES */
> > +    { AV_CODEC_ID_HEVC, MKTAG('h', 'e', 'v', '1') }, /* HEVC/H.265 which
> indicates parameter sets may be in ES */
> > +
> >      { AV_CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
> >      { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra  50M
> 720p24/30/60 */
> >      { AV_CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra  50M
> 720p25/50 */
> > diff --git a/libavformat/mov.c b/libavformat/mov.c
> > index f222cf8..53638cc 100644
> > --- a/libavformat/mov.c
> > +++ b/libavformat/mov.c
> > @@ -1604,8 +1604,11 @@ static int mov_skip_multiple_stsd(MOVContext *c,
> AVIOContext *pb,
> >          avio_skip(pb, size);
> >          return 1;
> >      }
> > -    if (codec_tag == AV_RL32("avc1"))
> > -        av_log(c->fc, AV_LOG_WARNING, "Concatenated H.264 might not play
> corrently.\n");
> > +    if ( codec_tag == AV_RL32("avc1") ||
> > +         codec_tag == AV_RL32("hvc1") ||
> > +         codec_tag == AV_RL32("hev1")
> > +    )
> > +        av_log(c->fc, AV_LOG_WARNING, "Concatenated H.264 or H.265 might
> not play corrently.\n");
> 
> correctly typo. (I know it's in the original code, but just fix it for
> convenience.)

fixed in seperate commit

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Dictatorship naturally arises out of democracy, and the most aggravated
form of tyranny and slavery out of the most extreme liberty. -- Plato
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20131016/35e1474d/attachment.asc>