Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:28:49 +0000 (10:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 11 Aug 2013 08:28:49 +0000 (10:28 +0200)
commitd2d8e259fd2e5149546431b6c7d1cd3560b7ab97
tree0dace1203dc7941216e613d0e4ff13e24a147b71
parent019eb2c77b7c315580200a5dbe6dabb1c97a3764
parent5eb488bfa835f2902a31ba99d57c16ae36c4f598
Merge commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598'

* commit '5eb488bfa835f2902a31ba99d57c16ae36c4f598':
  h264: use explicit variable names for *_field_flag

Conflicts:
libavcodec/h264.c

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