OSDN Git Service

Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 12:38:40 +0000 (14:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 30 Aug 2014 12:38:44 +0000 (14:38 +0200)
commitce36d80881132d3ddb7d2d859a604106cf7e92d4
tree586846f568c11c4a6426f48f1c167191d889626a
parenta808733675ccfaf19e923477b18c1ad15be4dd67
parentf22c24bd7a57eca27ccc400dbb334b20db5fb050
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
  ffmpeg: Clean up if filter initialisation failed to avoid a memleak.

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