summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-08 02:13:48 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-08 02:27:27 +0100
commitecfd48dc065bf279acc6281416e883246884db21 (patch)
treecd5c025bf27ce616c4038d829ff1d37bc6d1d539
parent29fd3032cc961c02acd45ef63aa3e687f5cd15af (diff)
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 <michaelni@gmx.at>
-rw-r--r--libavcodec/h264.h7
-rw-r--r--libavcodec/h264_refs.c7
2 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/h264.h b/libavcodec/h264.h
index bf74f9c366..2d363c9857 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 8278a07b83..75025dc3fe 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;