Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 16:48:24 +0000 (17:48 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 9 Dec 2013 16:48:24 +0000 (17:48 +0100)
commitf3acdd44bf37557574dea2c2c6d9771642e9ebbc
treeece8ce0c42a2aa296242a940f1d216531a384d14
parent04dac5d1e00846610e65b928b2461eba39425613
parenta1ee1648690726b34e98eaf8db04fd7b3303cfc8
Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'

* commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8':
  lavc/decode_video(): always unref the frame if there is no output in decode_video

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/utils.c