[FFmpeg-devel] [FFmpeg-commits] h264: Add Intra and Constrained Baseline profiles to avctx.profile
Michael Niedermayer
michaelni
Tue Feb 1 21:17:29 CET 2011
On Tue, Feb 01, 2011 at 09:02:34PM +0100, Stefano Sabatini wrote:
> On date Tuesday 2011-02-01 20:40:52 +0100, Janne Grunau encoded:
> > Module: ffmpeg
> > Branch: master
> > Commit: fe9a3fbe42ebe5debd57550313ed4c3a065f1770
> >
> > Author: Janne Grunau <janne-ffmpeg at jannau.net>
> > Date: Fri Jan 28 22:15:47 2011 +0100
> >
> > h264: Add Intra and Constrained Baseline profiles to avctx.profile
> >
> > ---
> >
> > libavcodec/avcodec.h | 23 +++++++++++++++--------
> > libavcodec/h264.c | 29 ++++++++++++++++++++++++++++-
> > libavcodec/h264.h | 6 ++++++
> > libavcodec/h264_parser.c | 2 +-
> > libavcodec/h264_ps.c | 11 ++++++-----
> > 5 files changed, 56 insertions(+), 15 deletions(-)
> >
> > diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
> > index 601f8ed..d0de610 100644
> > --- a/libavcodec/avcodec.h
> > +++ b/libavcodec/avcodec.h
> > @@ -2260,14 +2260,21 @@ typedef struct AVCodecContext {
> > #define FF_PROFILE_DTS_HD_HRA 50
> > #define FF_PROFILE_DTS_HD_MA 60
> >
> > -#define FF_PROFILE_H264_BASELINE 66
> > -#define FF_PROFILE_H264_MAIN 77
> > -#define FF_PROFILE_H264_EXTENDED 88
> > -#define FF_PROFILE_H264_HIGH 100
> > -#define FF_PROFILE_H264_HIGH_10 110
> > -#define FF_PROFILE_H264_HIGH_422 122
> > -#define FF_PROFILE_H264_HIGH_444 244
> > -#define FF_PROFILE_H264_CAVLC_444 44
> > +#define FF_PROFILE_H264_CONSTRAINED (1<<9) // 8+1; constraint_set1_flag
> > +#define FF_PROFILE_H264_INTRA (1<<11) // 8+3; constraint_set3_flag
> > +
> > +#define FF_PROFILE_H264_BASELINE 66
> > +#define FF_PROFILE_H264_CONSTRAINED_BASELINE (66|FF_PROFILE_H264_CONSTRAINED)
> > +#define FF_PROFILE_H264_MAIN 77
> > +#define FF_PROFILE_H264_EXTENDED 88
> > +#define FF_PROFILE_H264_HIGH 100
> > +#define FF_PROFILE_H264_HIGH_10 110
> > +#define FF_PROFILE_H264_HIGH_10_INTRA (110|FF_PROFILE_H264_INTRA)
> > +#define FF_PROFILE_H264_HIGH_422 122
> > +#define FF_PROFILE_H264_HIGH_422_INTRA (122|FF_PROFILE_H264_INTRA)
> > +#define FF_PROFILE_H264_HIGH_444_PREDICTIVE 244
> > +#define FF_PROFILE_H264_HIGH_444_INTRA (244|FF_PROFILE_H264_INTRA)
> > +#define FF_PROFILE_H264_CAVLC_444 44
>
> If these are public new symbols the version number must be updated, and
> an APIchanges entry added.
/me thinks the new review process of new team is working very well
just after someone mistakly commited a whole mail thread i think yesterday ...
[...]
--
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
If a bugfix only changes things apparently unrelated to the bug with no
further explanation, that is a good sign that the bugfix is wrong.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20110201/d69f85c7/attachment.pgp>
More information about the ffmpeg-devel
mailing list