diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-21 21:57:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-21 22:37:43 +0200 |
| commit | 87dced8074cf83e74e69d7dee725c8d62601c4e8 (patch) | |
| tree | 7fda3c5c5510001e32cbbeddc4030e5e84df1138 /libavformat/cafdec.c | |
| parent | fd0b8c6ad53ff2a01868ecf1bbf0c936876a0c61 (diff) | |
| parent | 1d01fee980edf60215acd94daf2533a9fefb9342 (diff) | |
| download | ffmpeg-87dced8074cf83e74e69d7dee725c8d62601c4e8.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fix hardcoded tables compililation caused by missing math constants
lavf: Make codec_tag arrays constant
twinvq: give massive struct a name.
lavf, lavu: version bumps and APIchanges for av_gettime() move
lavfi/audio: don't set cur_buf in ff_filter_samples().
lavfi/fifo: add audio version of the fifo filter.
fifo: fix parenthesis placement.
lavfi: rename vf_fifo.c -> fifo.c
lavc: remove stats_in from AVCodecContext options table.
Conflicts:
doc/APIchanges
libavfilter/Makefile
libavfilter/allfilters.c
libavfilter/audio.c
libavfilter/fifo.c
libavformat/version.h
libavutil/avutil.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cafdec.c')
| -rw-r--r-- | libavformat/cafdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c index e4b3c45c6b..6fad878566 100644 --- a/libavformat/cafdec.c +++ b/libavformat/cafdec.c @@ -410,5 +410,5 @@ AVInputFormat ff_caf_demuxer = { .read_header = read_header, .read_packet = read_packet, .read_seek = read_seek, - .codec_tag = (const AVCodecTag*[]){ ff_codec_caf_tags, 0 }, + .codec_tag = (const AVCodecTag* const []){ ff_codec_caf_tags, 0 }, }; |