Changeset 46a5003a in ffmpeg

Timestamp:

Jun 16, 2013, 8:40:43 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

0a5d22a1

Parents:

e997afdf (diff), 5d21ca45 (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 '5d21ca45591bb1c1d2265f8ed972d18c563f145e'

• commit '5d21ca45591bb1c1d2265f8ed972d18c563f145e': h264_mp4toannexb_bsf: K&R formatting cosmetics

Conflicts:

libavcodec/h264_mp4toannexb_bsf.c

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

(No files)