Michael Niedermayer
9d76cf0b18
Merge remote-tracking branch 'qatar/master' ...
* qatar/master:
rtpdec: Templatize the code for different g726 bitrate variants
rv40: move loop filter to rv34dsp context
lavf: make av_set_pts_info private.
rtpdec: Add support for G726 audio
rtpdec: Add an init function that can do custom codec context initialization
avconv: make copy_tb on by default.
matroskadec: don't set codec timebase.
rmdec: don't set codec timebase.
avconv: compute next_pts from input packet duration when possible.
lavf: estimate frame duration from r_frame_rate.
avconv: update InputStream.pts in the streamcopy case.
Conflicts:
avconv.c
libavdevice/alsa-audio-dec.c
libavdevice/bktr.c
libavdevice/fbdev.c
libavdevice/libdc1394.c
libavdevice/oss_audio.c
libavdevice/v4l.c
libavdevice/v4l2.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavformat/au.c
libavformat/eacdata.c
libavformat/flvdec.c
libavformat/mpegts.c
libavformat/mxfenc.c
libavformat/rtpdec_g726.c
libavformat/wtv.c
libavformat/xmv.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 18:08:23 +01:00
2011-11-14 07:22:31 +01:00
2011-11-29 00:20:29 +01:00
2011-11-30 20:34:45 +01:00
2011-10-20 02:34:51 +02:00
2011-11-12 02:50:25 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-27 00:30:13 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-11-19 02:00:06 +01:00
2011-11-14 00:33:39 +01:00
2011-11-05 16:51:25 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-08 10:35:14 +01:00
2011-11-11 02:50:35 +01:00
2011-12-01 02:54:24 +01:00
2011-11-28 01:07:11 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-14 00:33:39 +01:00
2011-11-24 15:03:27 +01:00
2011-11-19 02:00:06 +01:00
2011-11-14 00:33:39 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-14 07:22:31 +01:00
2011-11-14 07:22:30 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-11-14 00:33:39 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-14 00:33:39 +01:00
2011-11-24 03:32:24 +01:00
2011-11-13 13:14:39 +01:00
2011-11-03 02:16:26 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-21 02:01:26 +02:00
2011-10-21 02:01:26 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-21 02:01:26 +02:00
2011-11-03 02:16:26 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-21 02:01:26 +02:00
2011-11-02 10:43:39 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-24 03:32:24 +01:00
2011-11-14 07:22:31 +01:00
2011-10-29 22:08:25 +02:00
2011-10-13 06:00:03 +02:00
2011-11-14 00:33:39 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-22 18:57:01 +01:00
2011-11-11 02:50:35 +01:00
2011-11-12 02:50:25 +01:00
2011-11-03 02:16:26 +01:00
2011-10-24 01:01:21 +02:00
2011-11-03 20:21:01 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-08 10:33:21 +01:00
2011-10-29 02:08:54 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-21 02:01:26 +02:00
2011-10-28 21:46:30 +02:00
2011-11-05 15:07:19 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-05 15:07:19 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 17:39:32 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-24 03:32:24 +01:00
2011-11-29 00:20:29 +01:00
2011-11-06 11:52:57 +02:00
2011-11-05 15:07:19 +01:00
2011-11-13 05:19:28 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-11-14 00:33:39 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 16:50:25 +01:00
2011-12-01 02:54:24 +01:00
2011-11-14 20:59:28 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-29 02:08:54 +02:00
2011-12-01 02:54:24 +01:00
2011-11-08 23:54:25 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-08 02:03:14 +01:00
2011-11-08 02:03:14 +01:00
2011-12-01 02:54:24 +01:00
2011-11-26 01:12:08 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-11-30 20:34:45 +01:00
2011-12-01 02:54:24 +01:00
2011-11-15 03:13:42 +01:00
2011-11-07 03:01:43 +01:00
2011-11-03 02:16:26 +01:00
2011-10-13 06:00:03 +02:00
2011-11-05 15:07:19 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-13 16:50:20 +02:00
2011-10-13 06:00:03 +02:00
2011-11-08 02:03:14 +01:00
2011-11-28 01:07:11 +01:00
2011-11-28 01:07:11 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-03 02:16:26 +01:00
2011-12-01 02:54:24 +01:00
2011-11-29 00:20:29 +01:00
2011-11-19 02:00:06 +01:00
2011-10-18 01:54:40 +02:00
2011-12-01 02:54:24 +01:00
2011-11-30 17:39:32 +02:00
2011-12-01 02:54:24 +01:00
2011-11-07 03:01:43 +01:00
2011-11-29 00:20:29 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 17:39:32 +02:00
2011-12-01 02:54:24 +01:00
2011-11-14 00:33:39 +01:00
2011-10-21 02:01:26 +02:00
2011-12-01 02:54:24 +01:00
2011-10-13 06:00:03 +02:00
2011-11-14 00:33:39 +01:00
2011-12-01 02:54:24 +01:00
2011-11-03 02:16:26 +01:00
2011-11-19 02:00:06 +01:00
2011-10-18 01:54:40 +02:00
2011-11-14 00:33:39 +01:00
2011-11-14 00:33:39 +01:00
2011-11-28 04:29:47 +01:00
2011-10-29 02:08:54 +02:00
2011-12-01 02:54:24 +01:00
2011-10-17 16:51:48 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-21 02:01:26 +02:00
2011-10-30 15:43:19 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-14 00:33:39 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-28 10:01:50 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-11-19 02:14:28 +01:00
2011-11-14 00:33:39 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-10-20 02:34:51 +02:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-11-30 20:34:45 +01:00
2011-11-06 01:53:46 +01:00
2011-11-16 07:48:23 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
2011-12-01 02:54:24 +01:00
9d76cf0b18