diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 03:13:54 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-04 03:13:54 +0100 |
| commit | adc09a353c5ff467fdc924373e2ee1faf703b3b3 (patch) | |
| tree | d4568558c2c9e6dc442aff39941d3147b1df63f6 /libavcodec/mpegvideo.h | |
| parent | 9b9f64fe315ca7a7a8b9517ab5c082ecb8b698be (diff) | |
| parent | a3a55645f09fd4b5e491ed29ae4bddda4c2d41a5 (diff) | |
| download | ffmpeg-adc09a353c5ff467fdc924373e2ee1faf703b3b3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mpegvideo: remove disabled bfin asm
Conflicts:
libavcodec/bfin/mpegvideo_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mpegvideo.h')
| -rw-r--r-- | libavcodec/mpegvideo.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 6786ec1a1e..158153caba 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -805,7 +805,6 @@ void ff_dct_encode_init_x86(MpegEncContext *s); void ff_MPV_common_init_x86(MpegEncContext *s); void ff_MPV_common_init_axp(MpegEncContext *s); void ff_MPV_common_init_arm(MpegEncContext *s); -void ff_MPV_common_init_bfin(MpegEncContext *s); void ff_MPV_common_init_ppc(MpegEncContext *s); void ff_clean_intra_table_entries(MpegEncContext *s); void ff_draw_horiz_band(AVCodecContext *avctx, DSPContext *dsp, Picture *cur, |