Changeset 8c5fece1 in ffmpeg

Timestamp:

Feb 12, 2014, 2:00:03 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d32926db

Parents:

1bc3f1b7 (diff), 462d5e8e (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> (02/12/14 13:59:00)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (02/12/14 14:00:03)

Message:

Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'

• commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6': aacdec: set AVFrame sample_rate

Conflicts:

libavcodec/aacdec.c

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

(No files)