ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Sun Feb 8 02:13:48 2015 +0100| [ecfd48dc065bf279acc6281416e883246884db21] | committer: Michael Niedermayer
avcodec/h264: Move COPY_PICTURE() to h264.h so it can be used from other parts of the h264 decoder Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ecfd48dc065bf279acc6281416e883246884db21 --- libavcodec/h264.h | 7 +++++++ libavcodec/h264_refs.c | 7 ------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/h264.h b/libavcodec/h264.h index bf74f9c..2d363c9 100644 --- a/libavcodec/h264.h +++ b/libavcodec/h264.h @@ -892,6 +892,13 @@ void ff_h264_reset_sei(H264Context *h); */ const char* ff_h264_sei_stereo_mode(H264Context *h); +#define COPY_PICTURE(dst, src) \ +do {\ + *(dst) = *(src);\ + (dst)->f.extended_data = (dst)->f.data;\ + (dst)->tf.f = &(dst)->f;\ +} while (0) + /* * o-o o-o * / / / diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 8278a07..75025dc 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -36,13 +36,6 @@ #include <assert.h> -#define COPY_PICTURE(dst, src) \ -do {\ - *(dst) = *(src);\ - (dst)->f.extended_data = (dst)->f.data;\ - (dst)->tf.f = &(dst)->f;\ -} while (0) - static void pic_as_field(H264Picture *pic, const int parity){ int i; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog