diff options
| author | Diego Biurrun <diego@biurrun.de> | 2013-04-03 20:16:08 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-04-05 12:25:12 +0200 |
| commit | 66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780 (patch) | |
| tree | 7c199f8d8e2e9c3a984f9d8c5ef88efbb38562e7 | |
| parent | ed16c2dbf47cdd7c48825b4da6e7036698e5dde1 (diff) | |
| download | ffmpeg-66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780.tar.gz | |
h261: Move function declarations to h261.h
| -rw-r--r-- | libavcodec/h261.h | 9 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 11 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_motion.c | 1 |
4 files changed, 11 insertions, 11 deletions
diff --git a/libavcodec/h261.h b/libavcodec/h261.h index 21734a5e7d..b5201b1df6 100644 --- a/libavcodec/h261.h +++ b/libavcodec/h261.h @@ -50,4 +50,13 @@ typedef struct H261Context{ extern uint8_t ff_h261_rl_table_store[2][2*MAX_RUN + MAX_LEVEL + 3]; +void ff_h261_loop_filter(MpegEncContext *s); + +int ff_h261_get_picture_format(int width, int height); +void ff_h261_reorder_mb_index(MpegEncContext *s); +void ff_h261_encode_mb(MpegEncContext *s, int16_t block[6][64], + int motion_x, int motion_y); +void ff_h261_encode_picture_header(MpegEncContext *s, int picture_number); +void ff_h261_encode_init(MpegEncContext *s); + #endif /* AVCODEC_H261_H */ diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 58e5136f4d..5596b77feb 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -895,17 +895,6 @@ extern const uint8_t ff_aic_dc_scale_table[32]; extern const uint8_t ff_h263_chroma_qscale_table[32]; extern const uint8_t ff_h263_loop_filter_strength[32]; -/* h261.c */ -void ff_h261_loop_filter(MpegEncContext *s); -void ff_h261_reorder_mb_index(MpegEncContext* s); -void ff_h261_encode_mb(MpegEncContext *s, - int16_t block[6][64], - int motion_x, int motion_y); -void ff_h261_encode_picture_header(MpegEncContext * s, int picture_number); -void ff_h261_encode_init(MpegEncContext *s); -int ff_h261_get_picture_format(int width, int height); - - /* rv10.c */ void ff_rv10_encode_picture_header(MpegEncContext *s, int picture_number); int ff_rv_decode_dc(MpegEncContext *s, int n); diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 4249691cd6..86c05d5d7e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -37,6 +37,7 @@ #include "dsputil.h" #include "mpeg12.h" #include "mpegvideo.h" +#include "h261.h" #include "h263.h" #include "mathops.h" #include "mjpegenc.h" diff --git a/libavcodec/mpegvideo_motion.c b/libavcodec/mpegvideo_motion.c index 0c86cfdafe..a524fa3064 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -26,6 +26,7 @@ #include "libavutil/internal.h" #include "avcodec.h" #include "dsputil.h" +#include "h261.h" #include "mpegvideo.h" #include "mjpegenc.h" #include "msmpeg4.h" |