Changeset 3bbf3f7e in ffmpeg

Timestamp:

Apr 24, 2012, 12:30:41 AM (13 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

88ee2aa

Parents:

2e8f19d2 (diff), 7521c4ba (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/23/12 22:19:55)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/24/12 00:30:41)

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: matroska: Clear prev_pkt between seeks. avutil: change default buffer size alignment for sample buffer functions audemux: Add a sanity check for the number of channels Remove libdirac decoder. matroska: Add incremental parsing of clusters. avconv: fix off by one check in complex_filter mpegts: Try seeking back even for nonseekable protocols swscale: K&R formatting cosmetics (part III)

Conflicts:

configure
doc/general.texi
doc/platform.texi
ffmpeg.c
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/libdirac.h
libavcodec/libdiracdec.c
libavformat/au.c
libavformat/mpegts.c
libswscale/input.c
tests/ref/seek/lavf_mkv

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

(No files)