Merge commit 'c39059bea3adebcd888571d1181db215eee54495'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jul 2014 00:14:25 +0000 (02:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 21 Jul 2014 00:16:13 +0000 (02:16 +0200)
* commit 'c39059bea3adebcd888571d1181db215eee54495':
  h264: Fix direct temporal mvs for bottom-field-first poc order

Conflicts:
libavcodec/h264_direct.c

See: ebd1c505d22ad96e044880755ed9f4cf7cab4f78
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavcodec/h264_direct.c

Simple merge