Changeset 552ec4c in ffmpeg

Timestamp:

Dec 17, 2011, 1:18:16 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9af6abdc

Parents:

6d8e6fe (diff), a1e98f19 (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> (12/17/11 00:36:59)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (12/17/11 01:18:16)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: get_bits: remove A32 variant avconv: support stream specifiers in -metadata and -map_metadata wavpack: Fix 32-bit clipping wavpack: Clip samples after shifting h264: don't drop B-frames after next keyframe on POC reset. get_bits: remove useless pointer casts configure: refactor lists of tests and components into variables rv40: NEON optimised weak loop filter mpegts: replace some magic numbers with the existing define swscale: add unscaled packed 16 bit per component endianess conversion

Conflicts:

libavcodec/get_bits.h
libavcodec/h264.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)