Merge commit '190d4a447bc6ae4ecbbbb1c70f482a9c1fb6026c'

Browse Source

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

...

This commit is contained in:

Michael Niedermayer 2014-02-05 01:27:48 +01:00

parent dcbc748ad1 190d4a447b

commit bd9492174d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available