]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: bd94921)
Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 00:27:48 +0000 (01:27 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 5 Feb 2014 00:27:48 +0000 (01:27 +0100)
* commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c':
  avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

Conflicts:
libavcodec/utils.c

No change as we dont call this deprecated function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

No differences found
Unnamed repository; edit this file 'description' to name the repository.