-
- Downloads
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>
No related branches found
No related tags found
Showing
- configure 1 addition, 1 deletionconfigure
- doc/APIchanges 3 additions, 0 deletionsdoc/APIchanges
- libavcodec/aacps_tablegen.h 1 addition, 0 deletionslibavcodec/aacps_tablegen.h
- libavcodec/cos_tablegen.c 0 additions, 3 deletionslibavcodec/cos_tablegen.c
- libavcodec/options_table.h 0 additions, 1 deletionlibavcodec/options_table.h
- libavcodec/sinewin_tablegen.c 0 additions, 3 deletionslibavcodec/sinewin_tablegen.c
- libavcodec/twinvq_data.h 1 addition, 1 deletionlibavcodec/twinvq_data.h
- libavfilter/Makefile 2 additions, 1 deletionlibavfilter/Makefile
- libavfilter/allfilters.c 1 addition, 0 deletionslibavfilter/allfilters.c
- libavfilter/audio.c 10 additions, 8 deletionslibavfilter/audio.c
- libavfilter/fifo.c 52 additions, 21 deletionslibavfilter/fifo.c
- libavformat/cafdec.c 1 addition, 1 deletionlibavformat/cafdec.c
- libavformat/ivfdec.c 1 addition, 1 deletionlibavformat/ivfdec.c
- libavformat/version.h 1 addition, 1 deletionlibavformat/version.h
- libavutil/avutil.h 1 addition, 1 deletionlibavutil/avutil.h
Loading
Please register or sign in to comment