Michael Niedermayer 98ca3fb9cf Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be' ...

* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
  vp8: stop using deprecated avcodec_set_dimensions
  vp56: stop using deprecated avcodec_set_dimensions
  vp3: stop using deprecated avcodec_set_dimensions
  txd: stop using deprecated avcodec_set_dimensions
  truemotion1: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/txd.c
	libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2013-11-01 15:49:58 +01:00

10 KiB

Raw Blame History

View Raw