Merge remote-tracking branch 'newdev/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Mar 2011 23:50:36 +0000 (01:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 27 Mar 2011 23:50:36 +0000 (01:50 +0200)
* newdev/master:
  ac3enc: Add codec-specific options for writing AC-3 metadata.
NOT MERGED:  Remove arrozcru URL from documentation
  sndio support for playback and record

Conflicts:
doc/faq.texi
doc/general.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
12 files changed:
1  2 
Changelog
configure
doc/encoders.texi
doc/indevs.texi
doc/outdevs.texi
libavcodec/ac3.h
libavcodec/ac3dec.c
libavcodec/ac3enc.c
libavcodec/ac3enc_fixed.c
libavcodec/ac3enc_float.c
libavdevice/Makefile
libavdevice/alldevices.c

diff --cc Changelog
+++ b/Changelog
@@@ -78,8 -78,8 +78,9 @@@ version <next>
  - movie source added
  - Bink version 'b' audio and video decoder
  - Bitmap Brothers JV playback system
 +- Linux framebuffer input device added
  - Apple HTTP Live Streaming protocol handler
+ - sndio support for playback and record
  
  
  version 0.6:
diff --cc configure
Simple merge
Simple merge
diff --cc doc/indevs.texi
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -42,9 -42,9 +42,10 @@@ void avdevice_register_all(void
      REGISTER_INOUTDEV (ALSA, alsa);
      REGISTER_INDEV    (BKTR, bktr);
      REGISTER_INDEV    (DV1394, dv1394);
 +    REGISTER_INDEV    (FBDEV, fbdev);
      REGISTER_INDEV    (JACK, jack);
      REGISTER_INOUTDEV (OSS, oss);
+     REGISTER_INOUTDEV (SNDIO, sndio);
      REGISTER_INDEV    (V4L2, v4l2);
      REGISTER_INDEV    (V4L, v4l);
      REGISTER_INDEV    (VFWCAP, vfwcap);