Merge commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 22:36:33 +0000 (23:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Nov 2013 22:36:33 +0000 (23:36 +0100)
* commit 'b068660ffa73f226cc03a67e214b8540fc1e11c4':
  lavc: deprecate CODEC_CAP_NEG_LINESIZES

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/avcodec.h
libavcodec/version.h

Simple merge
Simple merge