Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 16:28:42 +0000 (17:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 8 Mar 2013 18:12:03 +0000 (19:12 +0100)
commit2653e125204569b1e9439ee2671c6ebb23a94b80
tree4176f76bccc8cdd1c85b9d329a82867eda37d397
parent532f31a695c9530ce67a847be00d72e6e8acfd11
parent1afddbe59e96af75f1c07605afc95615569f388f
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'

* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
libavcodec/avpacket.c
libavcodec/utils.c
libavdevice/v4l2.c
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/matroskaenc.c
libavformat/mux.c
libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
24 files changed:
ffmpeg.c
libavcodec/avcodec.h
libavcodec/avpacket.c
libavcodec/utils.c
libavcodec/version.h
libavdevice/v4l2.c
libavformat/asfdec.c
libavformat/avformat.h
libavformat/avidec.c
libavformat/flacdec.c
libavformat/id3v2.c
libavformat/id3v2.h
libavformat/matroskadec.c
libavformat/matroskaenc.c
libavformat/mp3enc.c
libavformat/mpegts.c
libavformat/mux.c
libavformat/mxg.c
libavformat/psxstr.c
libavformat/rmdec.c
libavformat/rtpdec.c
libavformat/rtpdec_qt.c
libavformat/subtitles.c
libavformat/utils.c