ffmpeg.git
6 years agoMerge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'
Michael Niedermayer [Tue, 12 Mar 2013 17:10:35 +0000 (18:10 +0100)]
Merge commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38'

* commit '9d3009c6c4b9b6734f07df7c88f6a42ded6cdf38':
  avconv: print an error on applying options of the wrong type.
  atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
  output-example: Update to use encode_video2 instead of the now dropped encode_video

Conflicts:
doc/examples/muxing.c
ffmpeg_opt.c
libavutil/atomic.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agopthread: fix unused variable warning
Michael Niedermayer [Tue, 12 Mar 2013 15:43:06 +0000 (16:43 +0100)]
pthread: fix unused variable warning

6 years agolavd/v4l2: fix bug in init_convert_timestamp()
Giorgio Vazzana [Mon, 11 Mar 2013 15:39:52 +0000 (16:39 +0100)]
lavd/v4l2: fix bug in init_convert_timestamp()

The current code returned a period=0, resulting in identical pts for all frames
after time-filtering. This is because AV_TIME_BASE_Q={1, AV_TIME_BASE} and
not {AV_TIME_BASE, 1}. With this patch the correct period in microseconds is computed.

6 years agoMerge commit '2240e92f052960693de55cf4924e80426dfaa965'
Michael Niedermayer [Tue, 12 Mar 2013 15:36:21 +0000 (16:36 +0100)]
Merge commit '2240e92f052960693de55cf4924e80426dfaa965'

* commit '2240e92f052960693de55cf4924e80426dfaa965':
  atomic: Add include guards to the implementation headers
  lavc: update the fallback versions of ff_thread_*

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f'
Michael Niedermayer [Tue, 12 Mar 2013 15:31:21 +0000 (16:31 +0100)]
Merge commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f'

* commit '19dd4017ab6dac11c77d797acebee4f60ad63a6f':
  libopencore-amr: Add the missing 3rd argument of ff_get_buffer()
  vmdaudio: fix invalid reads when packet size is not a multiple of chunk size
  wmaprodec: return an error, not 0, when the input is too small.

Conflicts:
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavf: add AV_ to two remaining CODEC_ID_*.
Nicolas George [Tue, 12 Mar 2013 14:56:52 +0000 (15:56 +0100)]
lavf: add AV_ to two remaining CODEC_ID_*.

6 years agoMerge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'
Michael Niedermayer [Tue, 12 Mar 2013 15:15:08 +0000 (16:15 +0100)]
Merge commit 'cacad1c058f66558ec727faac3b277d2dee264d4'

* commit 'cacad1c058f66558ec727faac3b277d2dee264d4':
  wmaprodec: require block_align to be set.
  wmadec: require block_align to be set.
  ivi_common: do not call MC for intra frames when dc_transform is unset

Conflicts:
libavcodec/ivi_common.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoxface: remove unused stuff, fix related warnings
Michael Niedermayer [Tue, 12 Mar 2013 15:04:46 +0000 (16:04 +0100)]
xface: remove unused stuff, fix related warnings

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3e2f200237af977b9253b0aff121eee27bcedb44'
Michael Niedermayer [Tue, 12 Mar 2013 14:57:23 +0000 (15:57 +0100)]
Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'

* commit '3e2f200237af977b9253b0aff121eee27bcedb44':
  roqvideodec: fix a potential infinite loop in roqvideo_decode_frame().
  xxan: fix invalid memory access in xan_decode_frame_type0()
  tty: set avg_frame_rate.
  FATE: enable multiple slices in the ffv1 vsynth test

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9'
Michael Niedermayer [Tue, 12 Mar 2013 14:51:22 +0000 (15:51 +0100)]
Merge commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9'

* commit 'd243896987b8b2062d1faba4d8d6f0c62d2dbee9':
  ffv1: fix calculating slice dimensions for version 2

Conflicts:
libavcodec/ffv1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
Michael Niedermayer [Tue, 12 Mar 2013 14:44:15 +0000 (15:44 +0100)]
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
libavcodec/h264.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'
Michael Niedermayer [Tue, 12 Mar 2013 14:29:20 +0000 (15:29 +0100)]
Merge commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111'

* commit 'd8b31be6caebd8d1321ecb754b6e7daaf81dc111':
  Add the bumps and APIchanges entries for reference counted buffers changes.

Conflicts:
Changelog
doc/APIchanges
libavcodec/version.h
libavdevice/version.h
libavfilter/version.h
libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: keep r_frame_rate
Michael Niedermayer [Tue, 12 Mar 2013 14:26:35 +0000 (15:26 +0100)]
avformat: keep r_frame_rate

This field is used and nothing equivalent exists

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avdevice: add missing time.h includes
Michael Niedermayer [Tue, 12 Mar 2013 14:25:59 +0000 (15:25 +0100)]
avformat/avdevice: add missing time.h includes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: postpone removial of parts still used
Michael Niedermayer [Tue, 12 Mar 2013 14:25:21 +0000 (15:25 +0100)]
avcodec: postpone removial of parts still used

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8df23e938b4022d6e6e9e1180ea6418abae74fda'
Michael Niedermayer [Tue, 12 Mar 2013 13:46:29 +0000 (14:46 +0100)]
Merge commit '8df23e938b4022d6e6e9e1180ea6418abae74fda'

* commit '8df23e938b4022d6e6e9e1180ea6418abae74fda':
  lavc: postpone the removal of request_channels API.
  AVFrame: deprecate all now unused fields

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'
Michael Niedermayer [Tue, 12 Mar 2013 13:27:45 +0000 (14:27 +0100)]
Merge commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9'

* commit 'ddcca4ba074aa537c3059c76d69eb4ad6316bfe9':
  lavc: stop setting AVFrame.motion_subsample_log2
  avserver: don't set deprecated options.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '354468fc12dcf93e7fb4af552e18906771913273'
Michael Niedermayer [Tue, 12 Mar 2013 12:40:42 +0000 (13:40 +0100)]
Merge commit '354468fc12dcf93e7fb4af552e18906771913273'

* commit '354468fc12dcf93e7fb4af552e18906771913273':
  avplay: switch to new refcounted frames API
  avconv: convert to new refcounted AVFrame API

Conflicts:
cmdutils.c
ffmpeg.c
ffmpeg.h
ffplay.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '37045e422903695e610cca6ecb753df643ab9380'
Michael Niedermayer [Tue, 12 Mar 2013 11:57:54 +0000 (12:57 +0100)]
Merge commit '37045e422903695e610cca6ecb753df643ab9380'

* commit '37045e422903695e610cca6ecb753df643ab9380':
  mpegvideo: drop vismv code

Conflicts:
libavcodec/mpegvideo.c

vismv code works fine, and thus only the unused fields are droped

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoutils: Dont sent fake channel layouts, 0 layout is better when its not known
Michael Niedermayer [Tue, 12 Mar 2013 11:42:27 +0000 (12:42 +0100)]
utils: Dont sent fake channel layouts, 0 layout is better when its not known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '2eba9087f3031c6050f8dcd996225490be6c2410'
Michael Niedermayer [Tue, 12 Mar 2013 11:41:16 +0000 (12:41 +0100)]
Merge commit '2eba9087f3031c6050f8dcd996225490be6c2410'

* commit '2eba9087f3031c6050f8dcd996225490be6c2410':
  lavc: make up a fake frame channel layout when there is no real one.

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d'
Michael Niedermayer [Tue, 12 Mar 2013 11:23:04 +0000 (12:23 +0100)]
Merge commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d'

* commit '192f1984b1a93aa08af053b8f9ab4950f307bd5d':
  lavc: limit maximum number of channels to 63

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca'
Michael Niedermayer [Tue, 12 Mar 2013 11:18:31 +0000 (12:18 +0100)]
Merge commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca'

* commit '15ec0450b4ae891f3e6ababa03c777a4443b94ca':
  lavc: allow decoders to override frame parameters.

Conflicts:
libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomss1: set frame defaults
Michael Niedermayer [Tue, 12 Mar 2013 11:11:50 +0000 (12:11 +0100)]
mss1: set frame defaults

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agobuffer: use the atomic get instead of the add and fetch variant.
Clément Bœsch [Tue, 12 Mar 2013 07:31:28 +0000 (08:31 +0100)]
buffer: use the atomic get instead of the add and fetch variant.

6 years agoget_video_buffer: add vertical padding
Michael Niedermayer [Tue, 12 Mar 2013 10:33:43 +0000 (11:33 +0100)]
get_video_buffer: add vertical padding

Fix memory corruption

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: fix motion vector vissualization
Michael Niedermayer [Tue, 12 Mar 2013 10:23:07 +0000 (11:23 +0100)]
avcodec: fix motion vector vissualization

was broken by the buffer ref stuff

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264/mpegvideo: fix ff_print_debug_info2 arguments
Michael Niedermayer [Tue, 12 Mar 2013 10:06:35 +0000 (11:06 +0100)]
h264/mpegvideo: fix ff_print_debug_info2 arguments

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agompegvideo: move ff_print_debug_info2 to where ff_print_debug_info is
Michael Niedermayer [Tue, 12 Mar 2013 09:51:03 +0000 (10:51 +0100)]
mpegvideo: move ff_print_debug_info2 to where ff_print_debug_info is

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoatomic: prefer gcc builtins over win32 atomics, if available.
Hendrik Leppkes [Sun, 10 Mar 2013 22:03:42 +0000 (23:03 +0100)]
atomic: prefer gcc builtins over win32 atomics, if available.

The mingw win32 atomics appear to be faulty, so they should not be used
if the gcc ones are available.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoatomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize
Martin Storsjö [Fri, 8 Mar 2013 10:32:38 +0000 (12:32 +0200)]
atomic: Check for __sync_val_compare_and_swap instead of __sync_synchronize

Not all gcc configurations have an implementation of all the atomic
operations, and some gcc configurations have some atomic builtins
implemented but not all.

Thus check for the most essential function, whose presence should
indicate that all others are present as well, since it can be used
to implement all the other ones.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agosnow: set frame defaults
Michael Niedermayer [Tue, 12 Mar 2013 03:29:00 +0000 (04:29 +0100)]
snow: set frame defaults

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3b199d29cd597a3518136d78860e172060b9e83d'
Michael Niedermayer [Tue, 12 Mar 2013 02:51:59 +0000 (03:51 +0100)]
Merge commit '3b199d29cd597a3518136d78860e172060b9e83d'

* commit '3b199d29cd597a3518136d78860e172060b9e83d':
  lavc decoders: properly initialize AVFrame.

Conflicts:
libavcodec/avs.c
libavcodec/c93.c
libavcodec/cinepak.c
libavcodec/flashsv.c
libavcodec/flicvideo.c
libavcodec/iff.c
libavcodec/mmvideo.c
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/qtrle.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoh264: disallow single unpaired fields as references of frames
Michael Niedermayer [Tue, 12 Mar 2013 01:08:06 +0000 (02:08 +0100)]
h264: disallow single unpaired fields as references of frames

Fixes deadlock

6 years agolavfi/moviesrc: use refcounted frames
Hendrik Leppkes [Mon, 11 Mar 2013 22:28:56 +0000 (23:28 +0100)]
lavfi/moviesrc: use refcounted frames

6 years agoh264: fix null pointer dereference and assertion failure
Michael Niedermayer [Mon, 11 Mar 2013 21:11:51 +0000 (22:11 +0100)]
h264: fix null pointer dereference and assertion failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoff_alloc_picture: free tables in case of dimension mismatches
Michael Niedermayer [Mon, 11 Mar 2013 20:29:14 +0000 (21:29 +0100)]
ff_alloc_picture: free tables in case of dimension mismatches

Fixes memory corruption
In theory this should not be needed but its better to check at
one place than to hope 50 other places set the flags correctly

6 years agompegvideo: dont allow last == current
Michael Niedermayer [Mon, 11 Mar 2013 19:19:34 +0000 (20:19 +0100)]
mpegvideo: dont allow last == current

this fixes deadlocks

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoupdate_frame_pool: use channel field
Michael Niedermayer [Mon, 11 Mar 2013 16:18:46 +0000 (17:18 +0100)]
update_frame_pool: use channel field

Fix memory corruption

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '759001c534287a96dc96d1e274665feb7059145d'
Michael Niedermayer [Tue, 12 Mar 2013 02:20:18 +0000 (03:20 +0100)]
Merge commit '759001c534287a96dc96d1e274665feb7059145d'

* commit '759001c534287a96dc96d1e274665feb7059145d':
  lavc decoders: work with refcounted frames.

Anton Khirnov (1):
      lavc decoders: work with refcounted frames.

Clément Bœsch (47):
      lavc/ansi: reset file
      lavc/ansi: re-do refcounted frame changes from Anton
      fraps: reset file
      lavc/fraps: switch to refcounted frames
      gifdec: reset file
      lavc/gifdec: switch to refcounted frames
      dsicinav: resolve conflicts
      smc: resolve conflicts
      zmbv: resolve conflicts
      rpza: resolve conflicts
      vble: resolve conflicts
      xxan: resolve conflicts
      targa: resolve conflicts
      vmnc: resolve conflicts
      utvideodec: resolve conflicts
      tscc: resolve conflicts
      ulti: resolve conflicts
      ffv1dec: resolve conflicts
      dnxhddec: resolve conflicts
      v210dec: resolve conflicts
      vp3: resolve conflicts
      vcr1: resolve conflicts
      v210x: resolve conflicts
      wavpack: resolve conflicts
      pngdec: fix compilation
      roqvideodec: resolve conflicts
      pictordec: resolve conflicts
      mdec: resolve conflicts
      tiertexseqv: resolve conflicts
      smacker: resolve conflicts
      vb: resolve conflicts
      vqavideo: resolve conflicts
      xl: resolve conflicts
      tmv: resolve conflicts
      vmdav: resolve conflicts
      truemotion1: resolve conflicts
      truemotion2: resolve conflicts
      lcldec: fix compilation
      libcelt_dec: fix compilation
      qdrw: fix compilation
      r210dec: fix compilation
      rl2: fix compilation
      wnv1: fix compilation
      yop: fix compilation
      tiff: resolve conflicts
      interplayvideo: fix compilation
      qpeg: resolve conflicts (FIXME/TESTME).

Hendrik Leppkes (33):
      012v: convert to refcounted frames
      8bps: fix compilation
      8svx: resolve conflicts
      4xm: resolve conflicts
      aasc: resolve conflicts
      bfi: fix compilation
      aura: fix compilation
      alsdec: resolve conflicts
      avrndec: convert to refcounted frames
      avuidec: convert to refcounted frames
      bintext: convert to refcounted frames
      cavsdec: resolve conflicts
      brender_pix: convert to refcounted frames
      cinepak: resolve conflicts
      cinepak: avoid using AVFrame struct directly in private context
      cljr: fix compilation
      cpia: convert to refcounted frames
      cscd: resolve conflicts
      iff: resolve conflicts and do proper conversion to refcounted frames
      4xm: fix reference frame handling
      cyuv: fix compilation
      dxa: fix compilation
      eacmv: fix compilation
      eamad: fix compilation
      eatgv: fix compilation
      escape124: remove unused variable.
      escape130: convert to refcounted frames
      evrcdec: convert to refcounted frames
      exr: convert to refcounted frames
      mvcdec: convert to refcounted frames
      paf: properly free the frame data on decode close
      sgirle: convert to refcounted frames
      lavfi/moviesrc: use refcounted frames

Michael Niedermayer (56):
      Merge commit '759001c534287a96dc96d1e274665feb7059145d'
      resolve conflicts in headers
      motion_est: resolve conflict
      mpeg4videodec: fix conflicts
      dpcm conflict fix
      dpx: fix conflicts
      indeo3: resolve confilcts
      kmvc: resolve conflicts
      kmvc: resolve conflicts
      h264: resolve conflicts
      utils: resolve conflicts
      rawdec: resolve conflcits
      mpegvideo: resolve conflicts
      svq1enc: resolve conflicts
      mpegvideo: dont clear data, fix assertion failure on fate vsynth1 with threads
      pthreads: resolve conflicts
      frame_thread_encoder: simple compilefix not yet tested
      snow: update to buffer refs
      crytsalhd: fix compile
      dirac: switch to new API
      sonic: update to new API
      svq1: resolve conflict, update to new API
      ffwavesynth: update to new buffer API
      g729: update to new API
      indeo5: fix compile
      j2kdec: update to new buffer API
      linopencore-amr: fix compile
      libvorbisdec: update to new API
      loco: fix compile
      paf: update to new API
      proresdec: update to new API
      vp56: update to new api / resolve conflicts
      xface: convert to refcounted frames
      xan: fix compile&fate
      v408: update to ref counted buffers
      v308: update to ref counted buffers
      yuv4dec: update to ref counted buffers
      y41p: update to ref counted frames
      xbm: update to refcounted frames
      targa_y216: update to refcounted buffers
      qpeg: fix fate/crash
      cdxl: fix fate
      tscc: fix reget buffer useage
      targa_y216dec: fix style
      msmpeg4: fix fate
      h264: ref_picture() copy fields that have been lost too
      update_frame_pool: use channel field
      h264: Put code that prevents deadlocks back
      mpegvideo: dont allow last == current
      wmalossless: fix buffer ref messup
      ff_alloc_picture: free tables in case of dimension mismatches
      h264: fix null pointer dereference and assertion failure
      frame_thread_encoder: update to bufrefs
      ec: fix used arrays
      snowdec: fix off by 1 error in dimensions check
      h264: disallow single unpaired fields as references of frames

Paul B Mahol (2):
      lavc/vima: convert to refcounted frames
      sanm: convert to refcounted frames

Conflicts:
libavcodec/4xm.c
libavcodec/8bps.c
libavcodec/8svx.c
libavcodec/aasc.c
libavcodec/alsdec.c
libavcodec/anm.c
libavcodec/ansi.c
libavcodec/avs.c
libavcodec/bethsoftvideo.c
libavcodec/bfi.c
libavcodec/c93.c
libavcodec/cavsdec.c
libavcodec/cdgraphics.c
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/cscd.c
libavcodec/dnxhddec.c
libavcodec/dpcm.c
libavcodec/dpx.c
libavcodec/dsicinav.c
libavcodec/dvdec.c
libavcodec/dxa.c
libavcodec/eacmv.c
libavcodec/eamad.c
libavcodec/eatgq.c
libavcodec/eatgv.c
libavcodec/eatqi.c
libavcodec/error_resilience.c
libavcodec/escape124.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/fraps.c
libavcodec/frwu.c
libavcodec/g723_1.c
libavcodec/gifdec.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_direct.c
libavcodec/h264_loopfilter.c
libavcodec/h264_refs.c
libavcodec/huffyuvdec.c
libavcodec/idcinvideo.c
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/indeo3.c
libavcodec/internal.h
libavcodec/interplayvideo.c
libavcodec/ivi_common.c
libavcodec/jvdec.c
libavcodec/kgv1dec.c
libavcodec/kmvc.c
libavcodec/lagarith.c
libavcodec/libopenjpegdec.c
libavcodec/mdec.c
libavcodec/mimic.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c
libavcodec/mmvideo.c
libavcodec/motion_est.c
libavcodec/motionpixels.c
libavcodec/mpc7.c
libavcodec/mpeg12.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/mpegvideo.h
libavcodec/msrle.c
libavcodec/msvideo1.c
libavcodec/nuv.c
libavcodec/options_table.h
libavcodec/pcx.c
libavcodec/pictordec.c
libavcodec/pngdec.c
libavcodec/pnmdec.c
libavcodec/pthread.c
libavcodec/qpeg.c
libavcodec/qtrle.c
libavcodec/r210dec.c
libavcodec/rawdec.c
libavcodec/roqvideodec.c
libavcodec/rpza.c
libavcodec/smacker.c
libavcodec/smc.c
libavcodec/svq1dec.c
libavcodec/svq1enc.c
libavcodec/targa.c
libavcodec/tiertexseqv.c
libavcodec/tiff.c
libavcodec/tmv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c
libavcodec/tscc.c
libavcodec/ulti.c
libavcodec/utils.c
libavcodec/utvideodec.c
libavcodec/v210dec.c
libavcodec/v210x.c
libavcodec/vb.c
libavcodec/vble.c
libavcodec/vcr1.c
libavcodec/vmdav.c
libavcodec/vmnc.c
libavcodec/vp3.c
libavcodec/vp56.c
libavcodec/vp56.h
libavcodec/vp6.c
libavcodec/vqavideo.c
libavcodec/wavpack.c
libavcodec/xl.c
libavcodec/xxan.c
libavcodec/zmbv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agosnowdec: fix off by 1 error in dimensions check
Michael Niedermayer [Mon, 11 Mar 2013 23:28:08 +0000 (00:28 +0100)]
snowdec: fix off by 1 error in dimensions check

fixes infinite loop

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/buffersink: move the filter structures at the end.
Nicolas George [Sun, 10 Mar 2013 18:59:48 +0000 (19:59 +0100)]
lavfi/buffersink: move the filter structures at the end.

Also apply a few cosmetic fixes (spaces, trailing comma) to
help match them with the fork's implementation.

6 years agocmdutils: remove conditionnal pp include.
Clément Bœsch [Mon, 11 Mar 2013 02:55:08 +0000 (03:55 +0100)]
cmdutils: remove conditionnal pp include.

The definition of the include are needed for builds even without pp.
This should fix FATE with --disable-gpl after 63edd2f9.

6 years agolavfi/buffersink: implement av_buffersink_get_samples().
Nicolas George [Sun, 10 Mar 2013 15:44:46 +0000 (16:44 +0100)]
lavfi/buffersink: implement av_buffersink_get_samples().

Note: the implementation could be more efficient, but at
the cost of more diff.

Most of the code from the following commit:

commit a2cd9be212fca02dd3d6ee65cb6ab9f84c5e28e5
Author: Anton Khirnov <anton@khirnov.net>
Date:   Fri May 4 19:22:38 2012 +0200

    lavfi: add an audio buffer sink.

Adapted to call av_buffersink_get_frame_flags() instead of
accessing the frame directly.

6 years agolavfi/buffersrc: do not dereference NULL frame.
Nicolas George [Sun, 10 Mar 2013 15:28:33 +0000 (16:28 +0100)]
lavfi/buffersrc: do not dereference NULL frame.

frame = NULL is used to indicate EOF.

6 years agolavfi: rename sink_buffer.c into buffersink.c.
Nicolas George [Sun, 10 Mar 2013 15:01:12 +0000 (16:01 +0100)]
lavfi: rename sink_buffer.c into buffersink.c.

6 years agolavfi: remove buffersink.c.
Nicolas George [Sun, 10 Mar 2013 14:57:43 +0000 (15:57 +0100)]
lavfi: remove buffersink.c.

It only contains merge conflicts leftovers.
The real code is in sink_buffer.c.

6 years agolavfi/sink_buffer: move stuff to reduce the diff.
Nicolas George [Sun, 10 Mar 2013 14:55:33 +0000 (15:55 +0100)]
lavfi/sink_buffer: move stuff to reduce the diff.

Note: av_buffersink_get_samples() is not yet implemented,
abuffersink is not yet a drop-in replacement of the fork's
abuffersink.

6 years agolavfi/smartblur: add support to named options
Stefano Sabatini [Sun, 10 Mar 2013 12:13:10 +0000 (13:13 +0100)]
lavfi/smartblur: add support to named options

6 years agoffmpeg: re-enable use of buffersrc flags.
Nicolas George [Sun, 10 Mar 2013 13:07:29 +0000 (14:07 +0100)]
ffmpeg: re-enable use of buffersrc flags.

AV_BUFFERSRC_FLAG_PUSH is necessary to detect closed streams.

6 years agolavfi/buffersrc: implement flags.
Nicolas George [Sun, 10 Mar 2013 12:33:18 +0000 (13:33 +0100)]
lavfi/buffersrc: implement flags.

The PUSH flags is necessary for efficient scheduling;
otherwise there is no feedback when adding frames to
closed paths.

The NO_CHECK_FORMAT is a small optimization that does
not cost much to implement.

The KEEP_REF flag maps to the add/write distinction in
the fork's API.

6 years agoffmpeg: add the -canvas_size option.
Nicolas George [Wed, 27 Feb 2013 20:14:48 +0000 (21:14 +0100)]
ffmpeg: add the -canvas_size option.

Allows, amongst other things, to override the size guessed
by the sub2video hack.

Note: the -s option could have more or less the same semantic,
but it receives a special treatment by the options system.

6 years agoffmpeg: port sub2video to AVFrame.
Nicolas George [Sun, 10 Mar 2013 10:51:02 +0000 (11:51 +0100)]
ffmpeg: port sub2video to AVFrame.

And re-enable the FATE test.

6 years agodoc/ffplay,ffmpeg: mention the corresponding negated option for -stats
Stefano Sabatini [Sun, 10 Mar 2013 10:51:00 +0000 (11:51 +0100)]
doc/ffplay,ffmpeg: mention the corresponding negated option for -stats

This helps lazy users who didn't read the part about boolean options, in
case they grep for "-nostats".

-stdin and -stats are the only booleans option enabled by default. This
is a partial fix for Trac ticket #2332, a complete overhaul of boolean
options documentation is probably overkill.

6 years agocmdutils: clarify log message, in case of option routed to both codec and mux/demux...
Stefano Sabatini [Sun, 10 Mar 2013 10:05:32 +0000 (11:05 +0100)]
cmdutils: clarify log message, in case of option routed to both codec and mux/demux layer

6 years agocmdutils: remove duplicated check on CONFIG_POSTPROC
Stefano Sabatini [Sun, 10 Mar 2013 11:02:24 +0000 (12:02 +0100)]
cmdutils: remove duplicated check on CONFIG_POSTPROC

The check is already performed by the PRINT_LIB_INFO macro.

6 years agocmdutils: make print_all_libs_info() show libavresample version
Stefano Sabatini [Sun, 10 Mar 2013 10:48:11 +0000 (11:48 +0100)]
cmdutils: make print_all_libs_info() show libavresample version

Even if not directly supported by FFmpeg, it is still useful to see the
linked version of libavresample.

6 years agocmdutils: fix stylenits
Stefano Sabatini [Sun, 10 Mar 2013 10:04:24 +0000 (11:04 +0100)]
cmdutils: fix stylenits

6 years agolavfi/unsharp: add missing option flags
Stefano Sabatini [Sun, 10 Mar 2013 12:20:44 +0000 (13:20 +0100)]
lavfi/unsharp: add missing option flags

6 years agolavc/utils: fix typo and reword message in case of too low bitrate
Stefano Sabatini [Fri, 8 Mar 2013 22:39:50 +0000 (23:39 +0100)]
lavc/utils: fix typo and reword message in case of too low bitrate

6 years agoavfilter: avoid direct access to "frame"->channels
Michael Niedermayer [Sun, 10 Mar 2013 10:20:07 +0000 (11:20 +0100)]
avfilter: avoid direct access to "frame"->channels

This avoids ABI issues

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomem: Fix usage of memalign() on DJGPP.
Fabrizio Gennari [Sun, 10 Mar 2013 09:22:45 +0000 (10:22 +0100)]
mem: Fix usage of memalign() on DJGPP.

Credits to Khusraw of bttr-software.de forum.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
6 years agolavfi/pad: avoid buffer overflow in buffer_needs_copy()
Xi Wang [Sun, 10 Mar 2013 03:39:32 +0000 (22:39 -0500)]
lavfi/pad: avoid buffer overflow in buffer_needs_copy()

Replace & with short-circuit &&.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
6 years agolavfi: add curves filter.
Clément Bœsch [Mon, 4 Mar 2013 15:06:14 +0000 (16:06 +0100)]
lavfi: add curves filter.

6 years agolavfi: bump minor version after the first round of evil changes.
Clément Bœsch [Sun, 10 Mar 2013 01:59:43 +0000 (02:59 +0100)]
lavfi: bump minor version after the first round of evil changes.

6 years agosink_buffer: remove unused variables
Michael Niedermayer [Sun, 10 Mar 2013 01:52:15 +0000 (02:52 +0100)]
sink_buffer: remove unused variables

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp3: embed idct_permutation array directly in VP3DecoderContext.
Ronald S. Bultje [Sat, 9 Mar 2013 17:08:36 +0000 (09:08 -0800)]
vp3: embed idct_permutation array directly in VP3DecoderContext.

This makes the vp3 decoder less dependent on dsputil, and will aid
in making it (eventually) dsputil-independent.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi: remove remaining forgotten min/rej perms.
Clément Bœsch [Sun, 10 Mar 2013 01:32:35 +0000 (02:32 +0100)]
lavfi: remove remaining forgotten min/rej perms.

6 years agompegts: clear avprograms only for removed programs
Michael Niedermayer [Mon, 4 Feb 2013 22:41:53 +0000 (23:41 +0100)]
mpegts: clear avprograms only for removed programs

Fixes Ticket2186

Requested-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'cehoyos/master'
Michael Niedermayer [Sun, 10 Mar 2013 01:21:00 +0000 (02:21 +0100)]
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Revert "build: disable iconv by default."

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavfi/hue: reindent.
Clément Bœsch [Sat, 9 Mar 2013 04:19:14 +0000 (05:19 +0100)]
lavfi/hue: reindent.

6 years agolavfi/hue: add an optimized direct path.
Clément Bœsch [Sat, 9 Mar 2013 04:17:01 +0000 (05:17 +0100)]
lavfi/hue: add an optimized direct path.

6 years agoMerge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827'
Michael Niedermayer [Sun, 10 Mar 2013 01:08:58 +0000 (02:08 +0100)]
Merge commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827'

* commit '6e7b50b4270116ded8b874d76cb7c5b1a0341827':
  mpegvideo_enc: drop support for reusing the input motion vectors.

Conflicts:
libavcodec/motion_est.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavu/frame: fix not/note typo in doxy.
Clément Bœsch [Sun, 10 Mar 2013 01:07:34 +0000 (02:07 +0100)]
lavu/frame: fix not/note typo in doxy.

6 years agodoc: fix examples.
Clément Bœsch [Sat, 9 Mar 2013 23:33:47 +0000 (00:33 +0100)]
doc: fix examples.

6 years agofate: disable sub2video
Michael Niedermayer [Sat, 9 Mar 2013 23:07:34 +0000 (00:07 +0100)]
fate: disable sub2video

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoffmpeg: do not give away our reference to the frame.
Nicolas George [Sat, 9 Mar 2013 20:19:23 +0000 (21:19 +0100)]
ffmpeg: do not give away our reference to the frame.

Note: the logic here is temporary until the updates to
ffmpeg.c are merged.

6 years agolavc/rawdec: set field order on decoded frame.
Nicolas George [Sat, 9 Mar 2013 19:21:10 +0000 (20:21 +0100)]
lavc/rawdec: set field order on decoded frame.

6 years agorawdec: work with refcounted frames.
Nicolas George [Sat, 9 Mar 2013 15:47:38 +0000 (16:47 +0100)]
rawdec: work with refcounted frames.

Adapted from commit 759001c534287a96dc96d1e274665feb7059145d
by Anton Khirnov.

Also, fix the use of || instead of | in a flags check.

6 years agoMerge commit '7e350379f87e7f74420b4813170fe808e2313911'
Michael Niedermayer [Sun, 10 Mar 2013 00:30:30 +0000 (01:30 +0100)]
Merge commit '7e350379f87e7f74420b4813170fe808e2313911'

* commit '7e350379f87e7f74420b4813170fe808e2313911':
  lavfi: switch to AVFrame.

Conflicts:
doc/filters.texi
libavfilter/af_ashowinfo.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/buffersink.c
libavfilter/buffersrc.c
libavfilter/buffersrc.h
libavfilter/f_select.c
libavfilter/f_setpts.c
libavfilter/fifo.c
libavfilter/split.c
libavfilter/src_movie.c
libavfilter/version.h
libavfilter/vf_aspect.c
libavfilter/vf_bbox.c
libavfilter/vf_blackframe.c
libavfilter/vf_delogo.c
libavfilter/vf_drawbox.c
libavfilter/vf_drawtext.c
libavfilter/vf_fade.c
libavfilter/vf_fieldorder.c
libavfilter/vf_fps.c
libavfilter/vf_frei0r.c
libavfilter/vf_gradfun.c
libavfilter/vf_hqdn3d.c
libavfilter/vf_lut.c
libavfilter/vf_overlay.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavfilter/vf_showinfo.c
libavfilter/vf_transpose.c
libavfilter/vf_vflip.c
libavfilter/vf_yadif.c
libavfilter/video.c
libavfilter/vsrc_testsrc.c
libavfilter/yadif.h

Following are notes about the merge authorship and various technical details.

Michael Niedermayer:
  * Main merge operation, notably avfilter.c and video.c
  * Switch to AVFrame:
    - afade
    - anullsrc
    - apad
    - aresample
    - blackframe
    - deshake
    - idet
    - il
    - mandelbrot
    - mptestsrc
    - noise
    - setfield
    - smartblur
    - tinterlace
  * various merge changes and fixes in:
    - ashowinfo
    - blackdetect
    - field
    - fps
    - select
    - testsrc
    - yadif

Nicolas George:
  * Switch to AVFrame:
    - make rawdec work with refcounted frames. Adapted from commit
      759001c534287a96dc96d1e274665feb7059145d by Anton Khirnov.
      Also, fix the use of || instead of | in a flags check.
    - make buffer sink and src, audio and video work all together

Clément Bœsch:
  * Switch to AVFrame:
    - aevalsrc
    - alphaextract
    - blend
    - cellauto
    - colormatrix
    - concat
    - earwax
    - ebur128
    - edgedetect
    - geq
    - histeq
    - histogram
    - hue
    - kerndeint
    - life
    - movie
    - mp (with the help of Michael)
    - overlay
    - pad
    - pan
    - pp
    - pp
    - removelogo
    - sendcmd
    - showspectrum
    - showwaves
    - silencedetect
    - stereo3d
    - subtitles
    - super2xsai
    - swapuv
    - thumbnail
    - tile

Hendrik Leppkes:
  * Switch to AVFrame:
    - aconvert
    - amerge
    - asetnsamples
    - atempo
    - biquads

Matthieu Bouron:
  * Switch to AVFrame
    - alphamerge
    - decimate
    - volumedetect

Stefano Sabatini:
  * Switch to AVFrame:
    - astreamsync
    - flite
    - framestep

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Clément Bœsch <ubitux@gmail.com>
Signed-off-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Matthieu Bouron <matthieu.bouron@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoRevert "build: disable iconv by default."
Carl Eugen Hoyos [Sat, 9 Mar 2013 17:25:22 +0000 (18:25 +0100)]
Revert "build: disable iconv by default."

This reverts commit 9ad3cd5b5f848eb3cd033be515d34296f099148b.

The misdetection on OS X should be fixed, we will only get
problem reports if auto-detection is enabled.

6 years agoport FFmpeg lavc frame specificities to lavu functions.
Clément Bœsch [Sat, 9 Mar 2013 23:34:16 +0000 (00:34 +0100)]
port FFmpeg lavc frame specificities to lavu functions.

6 years agolavu/frame: copy the channels field.
Nicolas George [Sat, 9 Mar 2013 16:17:59 +0000 (17:17 +0100)]
lavu/frame: copy the channels field.

6 years agolavfi/showspectrum: fix outpicref initialization.
Clément Bœsch [Sat, 9 Mar 2013 22:52:30 +0000 (23:52 +0100)]
lavfi/showspectrum: fix outpicref initialization.

In 81f2549, output pixel format was changed from rgb24 to planar yuv,
but the initialization was left unchanged. As a result, the chroma
planes were left uninitalized. This was not noticed since the current
ff_get_video_buffer() seems to be initializing the buffer. This won't be
the case anymore after the Evil Plan.

6 years agox86/qpel: move fullpel and l2 functions to separate file.
Ronald S. Bultje [Sat, 9 Mar 2013 04:40:16 +0000 (20:40 -0800)]
x86/qpel: move fullpel and l2 functions to separate file.

This way, they can be shared between mpeg4qpel and h264qpel without
requiring either one to be compiled unconditionally.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodsputil: make square put/avg_pixels functions local to h264qpel.
Ronald S. Bultje [Sat, 9 Mar 2013 04:16:08 +0000 (20:16 -0800)]
dsputil: make square put/avg_pixels functions local to h264qpel.

Put a copy of the 8bit functions only in dsputil, where they are used
for some other things (e.g. mpeg4qpel, mspel, cavsqpel). We could perhaps
also try to share specifically the 8bit functions from h264qpel between
it and the others, but that will be slightly more complicated. H264qpel
already had these functions, so we can simply remove the duplicates.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/v4l2: simplify code
Giorgio Vazzana [Sat, 9 Mar 2013 13:46:00 +0000 (14:46 +0100)]
lavd/v4l2: simplify code

struct buff_data contains a pointer to struct video_data, so passing the
file descriptor again is redundant.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/v4l2: correctly handle error conditions in mmap_read_frame()
Giorgio Vazzana [Sat, 9 Mar 2013 13:36:56 +0000 (14:36 +0100)]
lavd/v4l2: correctly handle error conditions in mmap_read_frame()

In particular:

1) save errno before it (possibly) gets overwritten by other calls
2) do not forget to enqueue the buffer again in case of error

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoAdd some fate dependencies to fix make fate with --disable-everything.
Carl Eugen Hoyos [Sat, 9 Mar 2013 14:46:46 +0000 (15:46 +0100)]
Add some fate dependencies to fix make fate with --disable-everything.

6 years agoAdd some fate dependencies to fix make fate with --disable-avdevice.
Carl Eugen Hoyos [Sat, 9 Mar 2013 13:39:13 +0000 (14:39 +0100)]
Add some fate dependencies to fix make fate with --disable-avdevice.

6 years agolibutvideo: Prioritize compatibility with new versions
Stephen Hutchinson [Fri, 8 Mar 2013 22:42:24 +0000 (17:42 -0500)]
libutvideo: Prioritize compatibility with new versions

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoatomic: Add include guards to the implementation headers
Martin Storsjö [Fri, 8 Mar 2013 09:16:14 +0000 (11:16 +0200)]
atomic: Add include guards to the implementation headers

This makes them pass standalone compilation tests. Previously,
they included atomic.h which included themselves again, leading to
double definitions.

Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agolavc/utils: make sure the iconv descriptor can be opened only once.
Clément Bœsch [Fri, 8 Mar 2013 19:38:01 +0000 (20:38 +0100)]
lavc/utils: make sure the iconv descriptor can be opened only once.

This prevents trying to do some subtitles conversion for each event when
the character encoding is not found. It now aborts early instead of
flooding stderr.

6 years agoMerge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'
Michael Niedermayer [Fri, 8 Mar 2013 19:41:41 +0000 (20:41 +0100)]
Merge commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c'

* commit '77b2cd7b41d7ec8008b6fac753c04f77824c514c':
  AVFrame: add side data.

Conflicts:
libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'
Michael Niedermayer [Fri, 8 Mar 2013 19:18:45 +0000 (20:18 +0100)]
Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e'

* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
  Move AVFrame from lavc to lavu.

Conflicts:
libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'
Michael Niedermayer [Fri, 8 Mar 2013 18:35:37 +0000 (19:35 +0100)]
Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327'

* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
libavcodec/avcodec.h
libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'
Michael Niedermayer [Fri, 8 Mar 2013 18:17:31 +0000 (19:17 +0100)]
Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c'

* commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c':
  pthread: avoid copying input packets when possible.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '1afddbe59e96af75f1c07605afc95615569f388f'
Michael Niedermayer [Fri, 8 Mar 2013 16:28:42 +0000 (17:28 +0100)]
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>
6 years agoMerge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'
Michael Niedermayer [Fri, 8 Mar 2013 15:05:59 +0000 (16:05 +0100)]
Merge commit '1cec0624d0e6f48590283a57169b58b9fe8449d3'

* commit '1cec0624d0e6f48590283a57169b58b9fe8449d3':
  AVBuffer: add a new API for buffer pools

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'
Michael Niedermayer [Fri, 8 Mar 2013 15:01:00 +0000 (16:01 +0100)]
Merge commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb'

* commit '8e401dbe90cc77b1f3067a917d9fa48cefa3fcdb':
  lavu: add a new API for reference-counted data buffers.

Conflicts:
libavutil/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>