Changeset 60b46a00 in ffmpeg

Timestamp:

Feb 14, 2014, 12:35:45 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

99b12357

Parents:

5cbd7ce0 (diff), 73e8fab3 (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 '73e8fab31dc19c4371499e612856accbc00b2820'

• commit '73e8fab31dc19c4371499e612856accbc00b2820': h264: print values in case of error

Conflicts:

libavcodec/h264.c
libavcodec/h264_ps.c

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

(No files)