Changeset dc6eadaa in ffmpeg

Timestamp:

Feb 20, 2015, 9:03:54 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7b7f8d3e

Parents:

d19ca4b2 (diff), 46ad9ac9 (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 '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7'

• commit '46ad9ac9641d1fe8292ec1f46bbd2e4456621ca7': rtpdec_h264: Move a leftover comment into h264_handle_packet_stap_a

Conflicts:

libavformat/rtpdec_h264.c

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

(No files)