[FFmpeg-cvslog] Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Nov 16 23:36:33 2013 +0100| [ec9aef565291b1ab6c809030b2697fcbdde79a60] | committer: Michael Niedermayer

Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'

* commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4':
  lavc: deprecate CODEC_CAP_NEG_LINESIZES

Conflicts:
	libavcodec/avcodec.h

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

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