diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-24 02:08:21 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-24 03:32:24 +0100 |
commit | 8e576d58306df95d6373dd0ca2c1f21f1afaeca9 (patch) | |
tree | 5f7b9c8783b342e80e32b58b94ded819eb414b3c /libavcodec/arm/mdct_neon.S | |
parent | 7ffa9ea05aa951b6b13e615f1bd3b8280f758561 (diff) | |
parent | bbb46f3ec7128d8a624f2aa5b4f99ec44c0b9567 (diff) | |
download | ffmpeg-streaming-8e576d58306df95d6373dd0ca2c1f21f1afaeca9.zip ffmpeg-streaming-8e576d58306df95d6373dd0ca2c1f21f1afaeca9.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
libavutil: add utility functions to simplify allocation of audio buffers.
libavutil: add planar sample formats and av_sample_fmt_is_planar()
avconv: fix segfault at EOF with delayed pictures
pcmdec: remove unneeded resetting of samples pointer
avconv: remove a now unused parameter from output_packet().
avconv: formatting fixes in output_packet()
avconv: declare some variables in blocks where they are used
avconv: use the same behavior when decoding audio/video/subs
bethsoftvideo: return proper consumed size for palette packets.
cdg: skip packets that don't contain a cdg command.
crcenc: add flags
avconv: use vsync 0 for AVFMT_NOTIMESTAMPS formats.
tiffenc: add a private option for selecting compression algorithm
md5enc: add flags
ARM: remove needless .text/.align directives
Conflicts:
doc/APIchanges
libavcodec/tiffenc.c
libavutil/avutil.h
libavutil/samplefmt.c
libavutil/samplefmt.h
tests/ref/fate/bethsoft-vid
tests/ref/fate/cdgraphics
tests/ref/fate/film-cvid-pcm-stereo-8bit
tests/ref/fate/mpeg2-field-enc
tests/ref/fate/nuv
tests/ref/fate/tiertex-seq
tests/ref/fate/tscc-32bit
tests/ref/fate/vmnc-32bit
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/mdct_neon.S')
-rw-r--r-- | libavcodec/arm/mdct_neon.S | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/arm/mdct_neon.S b/libavcodec/arm/mdct_neon.S index 2def704..9b7dc6c 100644 --- a/libavcodec/arm/mdct_neon.S +++ b/libavcodec/arm/mdct_neon.S @@ -23,8 +23,6 @@ preserve8 - .text - #define ff_fft_calc_neon X(ff_fft_calc_neon) function ff_imdct_half_neon, export=1 |