Merge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:14:12 +0000 (14:14 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:14:12 +0000 (14:14 +0200)
* commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a':
  pictordec: pass correct context to avpriv_request_sample

Conflicts:
libavcodec/pictordec.c

No change as the avpriv_request_sample() has already been replaced by an implementation
of the codepath.

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

Trivial merge