Merge commit '7950e519bb094897f957b9a9531cc60ba46cbc91'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 08:08:30 +0000 (10:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 08:08:30 +0000 (10:08 +0200)
commit20be5e0a0e7563671efe0f085c9f160ff09ba494
tree4db1a4e402d97dae295a0c6607726f0f192c0556
parent038c4f65ee6c72f9d1ee4d4e46c74073992fabc8
parent7950e519bb094897f957b9a9531cc60ba46cbc91
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>
20 files changed:
libavcodec/avpacket.c
libavcodec/mlp_parser.c
libavcodec/mlpdec.c
libavcodec/options_table.h
libavcodec/pthread.c
libavcodec/utils.c
libavdevice/v4l2.c
libavfilter/avfilter.c
libavfilter/avfiltergraph.c
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/internal.h
libavformat/asfdec.c
libavformat/avidec.c
libavformat/mux.c
libavformat/mxg.c
libavformat/psxstr.c
libavformat/rmdec.c
libavformat/utils.c
libavutil/pixdesc.c