Merge commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 11:01:55 +0000 (12:01 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 26 Nov 2013 11:23:39 +0000 (12:23 +0100)
commit0290a646ac662a8552dfdb2de4887cac7a79acd1
tree865482572fcbbfc291349b8aa651143a60173779
parent8bf7ea8ac2104525e60cfd68097deb23430a0155
parentde44dfc7c0ec02bda7d846ef713145c890bfae3f
Merge commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f'

* commit 'de44dfc7c0ec02bda7d846ef713145c890bfae3f':
  vc1: Reset numref if fieldmode is not set

This change is redundant, numref is already reset

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