-
- Downloads
Merge remote-tracking branch 'newdev/master'
* newdev/master:
mov: set audio service type for AC-3 from bitstream mode in the 'dac3' atom.
Get audio_service_type for AC-3 based on bitstream mode in the AC-3 parser and decoder, and vice-versa for the AC-3 encoder.
Use audio_service_type to set stream disposition.
Add APIchanges entry for audio_service_type.
Add audio_service_type field to AVCodecContext for encoding and reporting of the service type in the audio bitstream.
configure: in check_ld, place new -l flags before existing ones
support @heading, @subheading, @subsubheading, and @subsubsection in texi2pod.pl
doc: update build system documentation
aacenc: indentation
aacenc: fix the side calculation in search_for_ms
vp8.c: rename EDGE_* to VP8_EDGE_*.
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
libavcodec/vp8.c
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
- doc/build_system.txt 32 additions, 19 deletionsdoc/build_system.txt
- doc/fate.txt 45 additions, 0 deletionsdoc/fate.txt
- doc/ffmpeg.texi 22 additions, 0 deletionsdoc/ffmpeg.texi
- doc/texi2pod.pl 4 additions, 2 deletionsdoc/texi2pod.pl
- ffmpeg.c 1 addition, 0 deletionsffmpeg.c
- libavcodec/aac_ac3_parser.c 1 addition, 0 deletionslibavcodec/aac_ac3_parser.c
- libavcodec/aac_ac3_parser.h 1 addition, 0 deletionslibavcodec/aac_ac3_parser.h
- libavcodec/aaccoder.c 2 additions, 2 deletionslibavcodec/aaccoder.c
- libavcodec/ac3.h 1 addition, 0 deletionslibavcodec/ac3.h
- libavcodec/ac3_parser.c 4 additions, 1 deletionlibavcodec/ac3_parser.c
- libavcodec/ac3dec.c 5 additions, 0 deletionslibavcodec/ac3dec.c
- libavcodec/ac3dec.h 1 addition, 0 deletionslibavcodec/ac3dec.h
- libavcodec/ac3enc.c 15 additions, 1 deletionlibavcodec/ac3enc.c
- libavcodec/avcodec.h 20 additions, 0 deletionslibavcodec/avcodec.h
- libavcodec/eac3dec.c 1 addition, 1 deletionlibavcodec/eac3dec.c
- libavcodec/options.c 10 additions, 0 deletionslibavcodec/options.c
- libavcodec/version.h 2 additions, 2 deletionslibavcodec/version.h
- libavcodec/vp8.c 1 addition, 1 deletionlibavcodec/vp8.c
Loading
Please register or sign in to comment