Changeset 18516439 in ffmpeg

Timestamp:

May 1, 2014, 2:46:38 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

e40ae8cc

Parents:

cac07d0e (diff), b2c31710 (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.

Message:

Merge commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683'

• commit 'b2c31710c96fa47d9dcd40b64d39663e8957f683': lavc: move CODEC_FLAG_NORMALIZE_AQP to mpegvideo

Conflicts:

libavcodec/version.h

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

(No files)