diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 21:31:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-05 21:31:14 +0200 |
| commit | e7c801d9d319e3dcc354694499269796df0acdee (patch) | |
| tree | f88f49bb1864707373605e1129c28023fbf428da | |
| parent | 3d73be071dfbe21f73644b85a57a52f86acd6589 (diff) | |
| parent | 66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780 (diff) | |
| download | ffmpeg-e7c801d9d319e3dcc354694499269796df0acdee.tar.gz | |
Merge commit '66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780'
* commit '66ac3dbf1e60c27d0f1d779a424c0b33b7ca3780':
h261: Move function declarations to h261.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 f59c96a9b1..001c663758 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 e62700cae3..30255f5a5d 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -921,17 +921,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 411b7dfa9e..5858865c1c 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 1439eb2245..be1b48d4d8 100644 --- a/libavcodec/mpegvideo_motion.c +++ b/libavcodec/mpegvideo_motion.c @@ -27,6 +27,7 @@ #include "libavutil/internal.h" #include "avcodec.h" #include "dsputil.h" +#include "h261.h" #include "mpegvideo.h" #include "mjpegenc.h" #include "msmpeg4.h" |