Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 15:03:23 +0000 (16:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 27 Jan 2015 15:03:23 +0000 (16:03 +0100)
commit392080cbe52868c00f8dfd4e60639c37a13165f4
tree3039ea6b0b267230503f674a0c355cc73049e2c6
parentf25f15b6e1c4f597b0d31fb5b9fe7e8e40dd0fb1
parent167e004e1aca7765686ed95d7cd8ea5064d4f6f6
Merge commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6'

* commit '167e004e1aca7765686ed95d7cd8ea5064d4f6f6':
  h264: drop any pretense of support for data partitioning

Conflicts:
libavcodec/h264.c

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