[FFmpeg-cvslog] Merge commit 'a1ee1648690726b34e98eaf8db04fd7b3303cfc8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Dec  9 17:48:24 2013 +0100| [f3acdd44bf37557574dea2c2c6d9771642e9ebbc] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3acdd44bf37557574dea2c2c6d9771642e9ebbc
---