Changeset fb17f03d in ffmpeg

Timestamp:

Jan 4, 2014, 1:56:29 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

9b9f64fe

Parents:

ad5e4e0f (diff), aec25b1c (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 'aec25b1c4650944d32706bfd40eb02bbd5587303'

• commit 'aec25b1c4650944d32706bfd40eb02bbd5587303': mpegvideo: split the encoding-only parts of frame_start() into a separate function

Conflicts:

libavcodec/mpegvideo.c
libavcodec/mpegvideo_enc.c

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

(No files)