diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-17 22:18:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-18 00:28:06 +0200 |
| commit | 123272374180d8dc3ce9dff50f0c77d5b3b3341f (patch) | |
| tree | 2c2add85161e74ebe6d4301a6607adc521112582 /libavcodec/dv_tablegen.h | |
| parent | a66675268f63dd6794ce946c7edbcb8b49ae0f13 (diff) | |
| parent | 0f96f0d9968a767ead3aec823fcdfb78f26f7be7 (diff) | |
| download | ffmpeg-123272374180d8dc3ce9dff50f0c77d5b3b3341f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
aacenc: Fix issues with huge values of bit_rate.
dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit().
proresenc: multithreaded quantiser search
riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
avconv: only set the "channels" option when it exists for the specified input format
avplay: update get_buffer to be inline with avconv
aacdec: More robust output configuration.
faac: Fix multi-channel ordering
faac: Add .channel_layouts
rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier
rtmp: Support 'rtmp_app', an option which overrides the name of application
avutil: add better documentation for AVSampleFormat
Conflicts:
libavcodec/aac.h
libavcodec/aacdec.c
libavcodec/aacenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dv_tablegen.h')
| -rw-r--r-- | libavcodec/dv_tablegen.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/dv_tablegen.h b/libavcodec/dv_tablegen.h index 9b3e406f6a..e8cdc21dcf 100644 --- a/libavcodec/dv_tablegen.h +++ b/libavcodec/dv_tablegen.h @@ -25,7 +25,6 @@ #include <stdint.h> -#include "libavutil/attributes.h" #include "dv_vlc_data.h" #if CONFIG_SMALL @@ -48,7 +47,7 @@ typedef struct dv_vlc_pair { #else static struct dv_vlc_pair dv_vlc_map[DV_VLC_MAP_RUN_SIZE][DV_VLC_MAP_LEV_SIZE]; -static void av_unused dv_vlc_map_tableinit(void) +static void dv_vlc_map_tableinit(void) { int i, j; for (i = 0; i < NB_DV_VLC - 1; i++) { |