diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-13 01:56:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-13 01:56:33 +0100 |
| commit | b25a265a5c921d2d223a8aeff2f918894d515934 (patch) | |
| tree | 480f9648f685220520a344ac293f66e307abfc5c /libavcodec/arm/mpegvideo_arm.h | |
| parent | 2d38081b4f65f23077cb1b27f2d08c82c45afa05 (diff) | |
| parent | bd3e07c82ae558c2cc3616115161827630826ec1 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
pcm-mpeg: convert to bytestream2 API
Revert "h264: clear trailing bits in partially parsed NAL units"
remove iwmmxt optimizations
mimic: do not continue if swap_buf_size is 0
mimic: convert to bytestream2 API
frwu: use MKTAG to check marker instead of AV_RL32
txd: port to bytestream2 API
c93: convert to bytestream2 API
iff: make .long_name more descriptive
FATE: add test for cdxl demuxer
rtsp: Fix a typo
Conflicts:
libavcodec/arm/dsputil_iwmmxt.c
libavcodec/arm/dsputil_iwmmxt_rnd_template.c
libavcodec/arm/mpegvideo_iwmmxt.c
libavcodec/c93.c
libavcodec/txd.c
libavutil/arm/cpu.c
tests/fate/demux.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/mpegvideo_arm.h')
| -rw-r--r-- | libavcodec/arm/mpegvideo_arm.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/arm/mpegvideo_arm.h b/libavcodec/arm/mpegvideo_arm.h index e9de979300..4ff93b76b9 100644 --- a/libavcodec/arm/mpegvideo_arm.h +++ b/libavcodec/arm/mpegvideo_arm.h @@ -21,7 +21,6 @@ #include "libavcodec/mpegvideo.h" -void ff_MPV_common_init_iwmmxt(MpegEncContext *s); void ff_MPV_common_init_armv5te(MpegEncContext *s); #endif /* AVCODEC_ARM_MPEGVIDEO_H */ |