Merge commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:25:17 +0000 (14:25 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 29 Jan 2013 13:25:24 +0000 (14:25 +0100)
commitd1bbd304bf608c9ca5fe747a8ee317e4c4e0ecbe
treecb34d55aa421569fd67f0819d56b21aeac348075
parent3c8085dc4250a98405eb64b3765f4ceb8d177c00
parentf81c37e40fe3236d54da12aef9cdba48ba70ec31
Merge commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31'

* commit 'f81c37e40fe3236d54da12aef9cdba48ba70ec31':
  vf_delogo: fix an uninitialized read.
  h264: remove obsolete comment.
  mpegvideo: remove some unused variables from Picture.
  utvideoenc/v410enc: do not set AVFrame.reference.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/h264.c
libavcodec/motion_est.c
libavcodec/mpegvideo.h
libavcodec/utvideoenc.c
libavcodec/v410enc.c