Changeset 7b376b39 in ffmpeg

Timestamp:

Apr 24, 2011, 1:41:22 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b678d6db

Parents:

c225615b (diff), b1ac139d (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/24/11 01:38:03)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/24/11 01:41:22)

Message:

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 files)