Changeset 58e12732 in ffmpeg

Timestamp:

Aug 21, 2013, 9:18:43 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b69b075a

Parents:

a76390d1 (diff), 2a615925 (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 '2a61592573d725956a4377641344afe263382648'

• commit '2a61592573d725956a4377641344afe263382648': avcodec: Remove some commented-out debug cruft

Conflicts:

libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mvpred.h
libavcodec/mjpegdec.c
libavcodec/mjpegenc.c

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

(No files)