Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Mar 2013 11:11:48 +0000 (12:11 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 5 Mar 2013 11:11:48 +0000 (12:11 +0100)
commit06ad309ab4b7089442968fa8ac49b8db5e2fce0a
treed46cf264521ade26a73ff065e95ebf813ed195d9
parentd7f9f34dc683f4990c670a9e7a5964997e6380b3
parent813b82b927b19532e3bc3397b972c8a27b9f6326
Merge commit '813b82b927b19532e3bc3397b972c8a27b9f6326'

* commit '813b82b927b19532e3bc3397b972c8a27b9f6326':
  configure: Fix silly typo in logging command of check_struct()
  fate: remove last incomplete frame from mpeg2-field-enc test

Conflicts:
tests/fate/video.mak
tests/ref/fate/mpeg2-field-enc

Merged-by: Michael Niedermayer <michaelni@gmx.at>
configure
tests/fate/video.mak
tests/ref/fate/mpeg2-field-enc