-
- Downloads
Merge remote branch 'qatar/master'
* qatar/master:
Handle unicode file names on windows
rtp: Rename the open/close functions to alloc/free
Lowercase all ff* program names.
Refer to ff* tools by their lowercase names.
NOT Pulled Replace more FFmpeg instances by Libav or ffmpeg.
Replace `` by $() syntax in shell scripts.
patcheck: Allow overiding grep program(s) through environment variables.
NOT Pulled Remove stray libavcore and _g binary references.
vorbis: Rename decoder/encoder files to follow general file naming scheme.
aacenc: Fix whitespace after last commit.
cook: Fix small typo in av_log_ask_for_sample message.
aacenc: Finish 3GPP psymodel analysis for non mid/side cases.
Remove RDFT dependency from AAC decoder.
Add some debug log messages to AAC extradata
Fix mov debug (u)int64_t format strings.
bswap: use native types for av_bwap16().
doc: FLV muxing is supported.
applehttp: Handle AES-128 encrypted streams
Add a protocol handler for AES CBC decryption with PKCS7 padding
doc: Mention that DragonFly BSD requires __BSD_VISIBLE set
Conflicts:
ffplay.c
ffprobe.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- cmdutils.c 63 additions, 0 deletionscmdutils.c
- configure 1 addition, 1 deletionconfigure
- doc/faq.texi 2 additions, 2 deletionsdoc/faq.texi
- doc/ffmpeg.texi 15 additions, 17 deletionsdoc/ffmpeg.texi
- doc/ffplay.texi 2 additions, 2 deletionsdoc/ffplay.texi
- doc/ffprobe.texi 6 additions, 6 deletionsdoc/ffprobe.texi
- doc/ffserver.texi 9 additions, 9 deletionsdoc/ffserver.texi
- doc/general.texi 2 additions, 2 deletionsdoc/general.texi
- ffmpeg.c 2 additions, 2 deletionsffmpeg.c
- ffplay.c 2 additions, 2 deletionsffplay.c
- ffprobe.c 2 additions, 2 deletionsffprobe.c
- ffserver.c 1 addition, 1 deletionffserver.c
- libavcodec/Makefile 2 additions, 2 deletionslibavcodec/Makefile
- libavcodec/aacdec.c 9 additions, 0 deletionslibavcodec/aacdec.c
- libavcodec/aacenc.c 3 additions, 1 deletionlibavcodec/aacenc.c
- libavcodec/aacpsy.c 313 additions, 15 deletionslibavcodec/aacpsy.c
- libavcodec/cook.c 1 addition, 1 deletionlibavcodec/cook.c
- libavcodec/twinvq.c 1 addition, 1 deletionlibavcodec/twinvq.c
- libavcodec/vorbisdec.c 0 additions, 0 deletionslibavcodec/vorbisdec.c
- libavcodec/vorbisenc.c 0 additions, 0 deletionslibavcodec/vorbisenc.c
Loading
Please register or sign in to comment