-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master: (47 commits)
lavc: hide private symbols.
lavc: deprecate img_get_alpha_info().
lavc: use avpriv_ prefix for ff_toupper4.
lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
lavc: use avpriv_ prefix for ff_ac3_parse_header.
lavc: use avpriv_ prefix for ff_frame_rate_tab.
lavc: rename ff_find_start_code to avpriv_mpv_find_start_code
lavc: use avpriv_ prefix for ff_split_xiph_headers.
lavc: use avpriv_ prefix for ff_dirac_parse_sequence_header.
lavc: use avpriv_ prefix for some dv symbols used in lavf.
lavc: use avpriv_ prefix for some flac symbols used in lavf.
lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
lavc: use avpriv_ prefix for some mpegaudio symbols used in lavf.
lavc: use avpriv_ prefix for ff_aac_parse_header().
lavf: hide private symbols.
lavf: use avpriv_ prefix for some dv functions.
lavf: use avpriv_ prefix for ff_new_chapter().
avcodec: add CODEC_CAP_DELAY note to avcodec_decode_audio3() documentation
avcodec: clarify the CODEC_CAP_DELAY note in avcodec_decode_video2()
avcodec: clarify documentation of CODEC_CAP_DELAY
...
Conflicts:
configure
doc/general.texi
libavcodec/Makefile
libavcodec/aacdec.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/dv.c
libavcodec/dvdata.c
libavcodec/dvdata.h
libavcodec/libspeexenc.c
libavcodec/mpegvideo.c
libavcodec/version.h
libavformat/avidec.c
libavformat/dv.c
libavformat/dv.h
libavformat/flvenc.c
libavformat/mov.c
libavformat/mp3enc.c
libavformat/oggparsespeex.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- Changelog 1 addition, 0 deletionsChangelog
- configure 1 addition, 1 deletionconfigure
- libavcodec/Makefile 1 addition, 0 deletionslibavcodec/Makefile
- libavcodec/aac_adtstoasc_bsf.c 2 additions, 2 deletionslibavcodec/aac_adtstoasc_bsf.c
- libavcodec/aac_parser.c 1 addition, 1 deletionlibavcodec/aac_parser.c
- libavcodec/aacadtsdec.c 3 additions, 3 deletionslibavcodec/aacadtsdec.c
- libavcodec/aacadtsdec.h 1 addition, 1 deletionlibavcodec/aacadtsdec.h
- libavcodec/aacdec.c 2 additions, 2 deletionslibavcodec/aacdec.c
- libavcodec/aacenc.c 2 additions, 2 deletionslibavcodec/aacenc.c
- libavcodec/ac3_parser.c 2 additions, 2 deletionslibavcodec/ac3_parser.c
- libavcodec/ac3_parser.h 1 addition, 1 deletionlibavcodec/ac3_parser.h
- libavcodec/ac3dec.c 1 addition, 1 deletionlibavcodec/ac3dec.c
- libavcodec/alsdec.c 1 addition, 1 deletionlibavcodec/alsdec.c
- libavcodec/asv1.c 1 addition, 1 deletionlibavcodec/asv1.c
- libavcodec/avcodec.h 16 additions, 4 deletionslibavcodec/avcodec.h
- libavcodec/bitstream.c 2 additions, 2 deletionslibavcodec/bitstream.c
- libavcodec/cavsdec.c 3 additions, 3 deletionslibavcodec/cavsdec.c
- libavcodec/cljr.c 1 addition, 1 deletionlibavcodec/cljr.c
- libavcodec/dirac.c 2 additions, 2 deletionslibavcodec/dirac.c
- libavcodec/dirac.h 2 additions, 2 deletionslibavcodec/dirac.h
Loading
Please register or sign in to comment