[FFmpeg-cvslog] Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 14 20:56:44 2013 +0100| [074bae745d9d99d94ef99f870d0a6bb50d1e7a0b] | committer: Michael Niedermayer

Merge commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878'

* commit 'ecf442a58b09bdb1dc1d2c3904b82ac5f79b2878':
  lavf: improve support for AVC-Intra files.

Conflicts:
	libavformat/internal.h
	libavformat/isom.c
	libavformat/mxfdec.c
	libavformat/utils.c

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=074bae745d9d99d94ef99f870d0a6bb50d1e7a0b
---