Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 13:09:17 +0000 (14:09 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 1 Nov 2013 13:09:17 +0000 (14:09 +0100)
commitbf688d23b5ff63395e4acf46b5d7fd5e610aab96
treeee2a25164d980386ac49455a96b0b1aa947955ec
parent4a356512676629b4a289ea33f2b39b5f151cfae3
parentec7063005ee67c0b4d4b83aa5118dd22ad1094e8
Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8'

* commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8':
  eatqi: stop using deprecated avcodec_set_dimensions
  eatgv: stop using deprecated avcodec_set_dimensions
  eatgq: stop using deprecated avcodec_set_dimensions
  eamad: stop using deprecated avcodec_set_dimensions

Conflicts:
libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c