Merge commit 'aaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 22:05:35 +0000 (00:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 2 Jun 2013 22:06:22 +0000 (00:06 +0200)
commit8c118207ea0b2fa4a1e8e54f19965c7dfda3755c
tree8293671919c90f4ea0dba16df583a13522a4a6e9
parent406632d1ef448ca6ada969b2f72707a6449a4046
parentaaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4
Merge commit 'aaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4' into release/1.1

* commit 'aaeef7fa0d6ebb1a3668894e67a70cd5084ce4f4':
  mjpegdec: properly report unsupported disabled features
  Prepare for 9.7 Release
  update Changelog
  proresdec: support mixed interlaced/non-interlaced content

Conflicts:
RELEASE
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
libavcodec/mjpegdec.c
libavcodec/proresdec_lgpl.c