On Wed, 12 Mar 2014 10:06:02 +0100, Vittorio Giovara <[email protected]> wrote: > --- > This patch replaces 8/12 and 9/12. > > Vittorio > > libavcodec/dxva2_h264.c | 1 + > libavcodec/dxva2_mpeg2.c | 1 + > libavcodec/dxva2_vc1.c | 1 + > libavcodec/error_resilience.c | 1 + > libavcodec/h261dec.c | 1 + > libavcodec/h261enc.c | 1 + > libavcodec/h263.c | 1 + > libavcodec/h264.c | 1 + > libavcodec/h264.h | 1 + > libavcodec/h264_cabac.c | 1 + > libavcodec/h264_cavlc.c | 1 + > libavcodec/h264_direct.c | 1 + > libavcodec/h264_loopfilter.c | 1 + > libavcodec/h264_mvpred.h | 1 + > libavcodec/h264_parser.c | 1 + > libavcodec/h264_refs.c | 1 + > libavcodec/ituh263dec.c | 1 + > libavcodec/ituh263enc.c | 1 + > libavcodec/motion_est.c | 1 + > libavcodec/mpeg12dec.c | 1 + > libavcodec/mpeg4video.c | 1 + > libavcodec/mpeg4videodec.c | 1 + > libavcodec/mpeg4videoenc.c | 1 + > libavcodec/mpegutils.h | 111 > ++++++++++++++++++++++++++++++++++++++++++ > libavcodec/mpegvideo.c | 1 + > libavcodec/mpegvideo.h | 82 ++----------------------------- > libavcodec/mpegvideo_enc.c | 1 + > libavcodec/mpegvideo_motion.c | 1 + > libavcodec/mpegvideo_xvmc.c | 1 + > libavcodec/msmpeg4dec.c | 1 + > libavcodec/ratecontrol.c | 1 + > libavcodec/rv30.c | 1 + > libavcodec/rv34.c | 1 + > libavcodec/rv40.c | 1 + > libavcodec/svq1enc.c | 1 + > libavcodec/svq3.c | 1 + > libavcodec/vaapi_h264.c | 1 + > libavcodec/vaapi_mpeg2.c | 1 + > libavcodec/vc1dec.c | 1 + > libavcodec/vdpau_h264.c | 1 + > libavcodec/wmv2dec.c | 1 + > 41 files changed, 154 insertions(+), 78 deletions(-) > create mode 100644 libavcodec/mpegutils.h > > diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c > index 049f816..663eb7d 100644 > --- a/libavcodec/dxva2_h264.c > +++ b/libavcodec/dxva2_h264.c > @@ -23,6 +23,7 @@ > #include "dxva2_internal.h" > #include "h264.h" > #include "h264data.h" > +#include "mpegutils.h" > > struct dxva2_picture_context { > DXVA_PicParams_H264 pp; > diff --git a/libavcodec/dxva2_mpeg2.c b/libavcodec/dxva2_mpeg2.c > index e0b2efa..b6c2361 100644 > --- a/libavcodec/dxva2_mpeg2.c > +++ b/libavcodec/dxva2_mpeg2.c > @@ -22,6 +22,7 @@ > > #include "libavutil/log.h" > #include "dxva2_internal.h" > +#include "mpegutils.h" > > #define MAX_SLICES 1024 > struct dxva2_picture_context { > diff --git a/libavcodec/dxva2_vc1.c b/libavcodec/dxva2_vc1.c > index a72d91e..b2614dd 100644 > --- a/libavcodec/dxva2_vc1.c > +++ b/libavcodec/dxva2_vc1.c > @@ -21,6 +21,7 @@ > */ > > #include "dxva2_internal.h" > +#include "mpegutils.h" > #include "vc1.h" > #include "vc1data.h" > > diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c > index 010b39e..0fa3548 100644 > --- a/libavcodec/error_resilience.c > +++ b/libavcodec/error_resilience.c > @@ -30,6 +30,7 @@ > #include "libavutil/internal.h" > #include "avcodec.h" > #include "error_resilience.h" > +#include "mpegutils.h" > #include "mpegvideo.h" > #include "rectangle.h" > #include "thread.h" > diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c > index 49eaee1..d6e5272 100644 > --- a/libavcodec/h261dec.c > +++ b/libavcodec/h261dec.c > @@ -26,6 +26,7 @@ > */ > > #include "avcodec.h" > +#include "mpegutils.h" > #include "mpegvideo.h" > #include "h263.h" > #include "h261.h" > diff --git a/libavcodec/h261enc.c b/libavcodec/h261enc.c > index 4cff998..5f0baba 100644 > --- a/libavcodec/h261enc.c > +++ b/libavcodec/h261enc.c > @@ -27,6 +27,7 @@ > > #include "libavutil/attributes.h" > #include "avcodec.h" > +#include "mpegutils.h" > #include "mpegvideo.h" > #include "h263.h" > #include "h261.h" > diff --git a/libavcodec/h263.c b/libavcodec/h263.c > index 2fa6ca3..6d5ffc0 100644 > --- a/libavcodec/h263.c > +++ b/libavcodec/h263.c > @@ -34,6 +34,7 @@ > #include "h263.h" > #include "h263data.h" > #include "mathops.h" > +#include "mpegutils.h" > #include "unary.h" > #include "flv.h" > #include "mpeg4video.h" > diff --git a/libavcodec/h264.c b/libavcodec/h264.c > index a814d93..ed7ec48 100644 > --- a/libavcodec/h264.c > +++ b/libavcodec/h264.c > @@ -42,6 +42,7 @@ > #include "h264_mvpred.h" > #include "golomb.h" > #include "mathops.h" > +#include "mpegutils.h" > #include "rectangle.h" > #include "svq3.h" > #include "thread.h" > diff --git a/libavcodec/h264.h b/libavcodec/h264.h > index a912db7..e3c0ac0 100644 > --- a/libavcodec/h264.h > +++ b/libavcodec/h264.h > @@ -38,6 +38,7 @@ > #include "h264dsp.h" > #include "h264pred.h" > #include "h264qpel.h" > +#include "mpegutils.h" > #include "rectangle.h" > > #define H264_MAX_PICTURE_COUNT 32 > diff --git a/libavcodec/h264_cabac.c b/libavcodec/h264_cabac.c > index 654eab7..f1ab97a 100644 > --- a/libavcodec/h264_cabac.c > +++ b/libavcodec/h264_cabac.c > @@ -38,6 +38,7 @@ > #include "h264data.h" > #include "h264_mvpred.h" > #include "golomb.h" > +#include "mpegutils.h" > > #if ARCH_X86 > #include "x86/h264_i386.h" > diff --git a/libavcodec/h264_cavlc.c b/libavcodec/h264_cavlc.c > index d3f6dcb..c0fd2e8 100644 > --- a/libavcodec/h264_cavlc.c > +++ b/libavcodec/h264_cavlc.c > @@ -34,6 +34,7 @@ > #include "h264data.h" // FIXME FIXME FIXME > #include "h264_mvpred.h" > #include "golomb.h" > +#include "mpegutils.h" > > #include <assert.h> > > diff --git a/libavcodec/h264_direct.c b/libavcodec/h264_direct.c > index f62251d..21c3d77 100644 > --- a/libavcodec/h264_direct.c > +++ b/libavcodec/h264_direct.c > @@ -29,6 +29,7 @@ > #include "avcodec.h" > #include "mpegvideo.h" > #include "h264.h" > +#include "mpegutils.h" > #include "rectangle.h" > #include "thread.h" > > diff --git a/libavcodec/h264_loopfilter.c b/libavcodec/h264_loopfilter.c > index 88ed34c..267884f 100644 > --- a/libavcodec/h264_loopfilter.c > +++ b/libavcodec/h264_loopfilter.c > @@ -32,6 +32,7 @@ > #include "mpegvideo.h" > #include "h264.h" > #include "mathops.h" > +#include "mpegutils.h" > #include "rectangle.h" > > #include <assert.h> > diff --git a/libavcodec/h264_mvpred.h b/libavcodec/h264_mvpred.h > index a7545f0..f7c3887 100644 > --- a/libavcodec/h264_mvpred.h > +++ b/libavcodec/h264_mvpred.h > @@ -31,6 +31,7 @@ > #include "internal.h" > #include "avcodec.h" > #include "h264.h" > +#include "mpegutils.h" > > #include <assert.h> > > diff --git a/libavcodec/h264_parser.c b/libavcodec/h264_parser.c > index a16229a..795a233 100644 > --- a/libavcodec/h264_parser.c > +++ b/libavcodec/h264_parser.c > @@ -30,6 +30,7 @@ > #include "h264data.h" > #include "golomb.h" > #include "internal.h" > +#include "mpegutils.h" > > #include <assert.h> > > diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c > index 277bc09..332866a 100644 > --- a/libavcodec/h264_refs.c > +++ b/libavcodec/h264_refs.c > @@ -29,6 +29,7 @@ > #include "avcodec.h" > #include "h264.h" > #include "golomb.h" > +#include "mpegutils.h" > > #include <assert.h> > > diff --git a/libavcodec/ituh263dec.c b/libavcodec/ituh263dec.c > index 98c8cfc..55a8c45 100644 > --- a/libavcodec/ituh263dec.c > +++ b/libavcodec/ituh263dec.c > @@ -36,6 +36,7 @@ > #include "mpegvideo.h" > #include "h263.h" > #include "mathops.h" > +#include "mpegutils.h" > #include "unary.h" > #include "flv.h" > #include "mpeg4video.h" > diff --git a/libavcodec/ituh263enc.c b/libavcodec/ituh263enc.c > index 0f59944..cd4ed84 100644 > --- a/libavcodec/ituh263enc.c > +++ b/libavcodec/ituh263enc.c > @@ -34,6 +34,7 @@ > #include "mpegvideo.h" > #include "h263.h" > #include "mathops.h" > +#include "mpegutils.h" > #include "unary.h" > #include "flv.h" > #include "mpeg4video.h" > diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c > index 04ae49e..08c0eba 100644 > --- a/libavcodec/motion_est.c > +++ b/libavcodec/motion_est.c > @@ -33,6 +33,7 @@ > > #include "avcodec.h" > #include "mathops.h" > +#include "mpegutils.h" > #include "mpegvideo.h" > > #undef NDEBUG > diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c > index cb713fd..06b7565 100644 > --- a/libavcodec/mpeg12dec.c > +++ b/libavcodec/mpeg12dec.c > @@ -36,6 +36,7 @@ > #include "internal.h" > #include "mpeg12.h" > #include "mpeg12data.h" > +#include "mpegutils.h" > #include "mpegvideo.h" > #include "thread.h" > #include "version.h" > diff --git a/libavcodec/mpeg4video.c b/libavcodec/mpeg4video.c > index 979904f..84fa26b 100644 > --- a/libavcodec/mpeg4video.c > +++ b/libavcodec/mpeg4video.c > @@ -20,6 +20,7 @@ > * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 > USA > */ > > +#include "mpegutils.h" > #include "mpegvideo.h" > #include "mpeg4video.h" > #include "mpeg4data.h" > diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c > index b6925ac..9405a02 100644 > --- a/libavcodec/mpeg4videodec.c > +++ b/libavcodec/mpeg4videodec.c > @@ -22,6 +22,7 @@ > > #include "error_resilience.h" > #include "internal.h" > +#include "mpegutils.h" > #include "mpegvideo.h" > #include "mpeg4video.h" > #include "h263.h" > diff --git a/libavcodec/mpeg4videoenc.c b/libavcodec/mpeg4videoenc.c > index 0063f58..3ddc3e4 100644 > --- a/libavcodec/mpeg4videoenc.c > +++ b/libavcodec/mpeg4videoenc.c > @@ -23,6 +23,7 @@ > #include "libavutil/attributes.h" > #include "libavutil/log.h" > #include "libavutil/opt.h" > +#include "mpegutils.h" > #include "mpegvideo.h" > #include "h263.h" > #include "mpeg4video.h" > diff --git a/libavcodec/mpegutils.h b/libavcodec/mpegutils.h > new file mode 100644 > index 0000000..293c5d8 > --- /dev/null > +++ b/libavcodec/mpegutils.h > @@ -0,0 +1,111 @@ > +/* > + * Mpeg video formats-related defines and utility functions > + * > + * This file is part of Libav. > + * > + * Libav is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Lesser General Public > + * License as published by the Free Software Foundation; either > + * version 2.1 of the License, or (at your option) any later version. > + * > + * Libav is distributed in the hope that it will be useful, > + * but WITHOUT ANY WARRANTY; without even the implied warranty of > + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + * Lesser General Public License for more details. > + * > + * You should have received a copy of the GNU Lesser General Public > + * License along with Libav; if not, write to the Free Software > + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 > USA > + */ > + > +#include "version.h" > + > +#ifndef AVCODEC_MPEGUTILS_H > +#define AVCODEC_MPEGUTILS_H
put the #include inside the guard Otherwise ok -- Anton Khirnov _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
