Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Mar 2011 00:46:11 +0000 (02:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Mar 2011 00:46:11 +0000 (02:46 +0200)
commit59bf303d6806e1ab0fa415f5313131c9ca7aedb7
tree10a2e9e17a6d4a0e499e8236da4acf49d95445aa
parent7dfd58ef495f2724cca40cd4a59b1d0c4d81aa28
parentc4549bd66a94bec1284dcca0da19e5038a82cbe3
Merge remote-tracking branch 'newdev/master'

* newdev/master:
  ac3enc: avoid memcpy() of exponents and baps in EXP_REUSE case by using exponent reference blocks.
  Chronomaster DFA decoder
DUPLICATE:  framebuffer device demuxer
NOT MERGED: cosmetics: fix dashed line length after 070c5d0
  http: header field names are case insensitive

Conflicts:
LICENSE
README
doc/indevs.texi
libavdevice/fbdev.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
14 files changed:
Changelog
doc/general.texi
doc/indevs.texi
libavcodec/Makefile
libavcodec/ac3enc.c
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/dfa.c
libavdevice/avdevice.h
libavdevice/fbdev.c
libavformat/allformats.c
libavformat/dfa.c
libavformat/http.c
libavformat/version.h