Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:34:49 +0000 (15:34 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 14:34:49 +0000 (15:34 +0100)
commit7630e564caaef008ae255c3b63ac725131073b6f
tree28d00107374434d841637f6a299446d1e7122f72
parenta897ba33e88316d2591a89ab93f8f69587d245ca
parentc755870d52c8c29676e5ba7ee9557adf4a7ca934
Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934'

* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
  sgidec: stop using deprecated avcodec_set_dimensions
  rv34: stop using deprecated avcodec_set_dimensions
  rv10: stop using deprecated avcodec_set_dimensions
  ptx: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/sgidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ptx.c
libavcodec/rv10.c
libavcodec/rv34.c
libavcodec/sgidec.c