diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-03 10:08:30 +0200 |
commit | 20be5e0a0e7563671efe0f085c9f160ff09ba494 (patch) | |
tree | 4db1a4e402d97dae295a0c6607726f0f192c0556 /doc/APIchanges | |
parent | 038c4f65ee6c72f9d1ee4d4e46c74073992fabc8 (diff) | |
parent | 7950e519bb094897f957b9a9531cc60ba46cbc91 (diff) | |
download | ffmpeg-20be5e0a0e7563671efe0f085c9f160ff09ba494.tar.gz |
Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
* commit '7950e519bb094897f957b9a9531cc60ba46cbc91':
Disable deprecation warnings for cases where a replacement is available
Conflicts:
libavcodec/avpacket.c
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfiltergraph.c
libavfilter/buffersrc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/APIchanges')
0 files changed, 0 insertions, 0 deletions