Changeset fa0f7c02 in ffmpeg

Timestamp:

May 11, 2014, 9:49:13 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

c4fe50b9

Parents:

8d19dd91 (diff), a871ef0c (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 'a871ef0cc936612bdb0e643196be72efcf0c8986'

• commit 'a871ef0cc936612bdb0e643196be72efcf0c8986': hwaccel: Rename priv_data_size to frame_priv_data_size

Conflicts:

libavcodec/avcodec.h

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

(No files)