aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/aacsbrdata.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-24 00:19:55 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-24 02:30:41 +0200
commit3bbf3f7e42247b7a8b34b1e8cc891b59e1327bb8 (patch)
treebf3b0776b76e0f5c4c331d9d069f16e3c0236a9c /libavcodec/aacsbrdata.h
parent2e8f19d26f3ef7e804a7f9f9811e4b538e0a5969 (diff)
parent7521c4bab28ff3a622171be5b39a6b210f4263f0 (diff)
downloadffmpeg-3bbf3f7e42247b7a8b34b1e8cc891b59e1327bb8.tar.gz
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>
Diffstat (limited to 'libavcodec/aacsbrdata.h')
0 files changed, 0 insertions, 0 deletions