Merge commit '458e7c94830d1522997e33a0b5e87bd709e8a349'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 10:18:52 +0000 (12:18 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 10:21:41 +0000 (12:21 +0200)
* commit '458e7c94830d1522997e33a0b5e87bd709e8a349':
  hevc: implement pic_output_flag handling

Conflicts:
libavcodec/hevc.c
libavcodec/hevc_refs.c

See: 2eddf3a6efd80aa6e9d7f42ad9a892a82c5ece70
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/hevc.c
libavcodec/hevc_refs.c

Simple merge
Simple merge