Changeset b3a647d9 in ffmpeg

Timestamp:

Jun 11, 2014, 12:57:08 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b2fb65c

Parents:

1290143f (diff), d7705be9 (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 'd7705be9617ed691c7a2924a2088de2d96f38af1'

• commit 'd7705be9617ed691c7a2924a2088de2d96f38af1': mpegvideoenc: check color_range

Conflicts:

libavcodec/mpegvideo_enc.c

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

(No files)