Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:36:03 +0000 (18:36 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 17:36:46 +0000 (18:36 +0100)
commit66df6f5407543cf791302bf3bc6958758bdae0eb
tree02522c460273505d552e8eaca9aaf3e98dd150d5
parentc97d397cbbf9f7fcbfeba1caaf8ecf7a1e35ab3d
parenta1504eee41b39f62dbfe0a0ca6b96c2716bf7577
Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577'

* commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577':
  lavc: deprecate AVCodecContext.debug_mv

Conflicts:
libavcodec/options_table.h

Not merged, debug_mv works fine

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