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)
commit1eb151c501ec66c554c3417b84acd57499241004
tree355052e76cbc7aa69e4fa98146e1c93ce38a22a5
parentefb21b0a8fbc61d01ba1f22677abfbca99e6167d
parentfe9bb61f9a16be19ad91875632c39e44b7a99a8a
Merge commit 'fe9bb61f9a16be19ad91875632c39e44b7a99a8a'

* 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>