Merge remote-tracking branch 'qatar/master'

* qatar/master: (27 commits)
  avconv: free packet in write_frame() when discarding due to frame number limit
  FATE: use +/- flag option syntax for vp8 emu-edge tests
  lavf: make av_interleave_packet_per_dts() private.
  lavf: deprecate av_read_packet().
  oggdec: output correct timestamps for Vorbis
  avconv: pass input stream timestamps to audio encoders
  lavc: shrink encoded audio packet size after encoding.
  xa: set correct bit rate
  xa: do not set bit_rate, block_align, or bits_per_coded_sample
  xa: fix end-of-file handling
  xa: fix timestamp calculation
  bink: fix typo in FFALIGN() argument
  bink: align plane width to 8 when calculating bundle sizes
  doc: pass -Idoc texi2html and texi2pod
  doc: texi2pod: add -I flag
  movenc: Add a min_frag_duration option
  rtsp: Set the default delay to 0.1 s for the RTSP/SDP/RTP demuxers
  libavformat: Set the default for the max_delay option to -1
  Generate manpages for AV{Format,Codec}Context AVOptions.
  doc/avconv: remove entries for AVOptions.
  ...

Conflicts:
	doc/Makefile
	doc/ffmpeg.texi
	doc/muxers.texi
	ffmpeg.c
	libavcodec/Makefile
	libavcodec/options.c
	libavcodec/vp8.c
	libavformat/options.c
	tests/fate/demux.mak
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24

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

1 files changed, 119 insertions, 119 deletions

diff --git a/tests/ref/fate/pcm_dvd b/tests/ref/fate/pcm_dvd
index 691e1a6119..6037451006 100644
--- a/tests/ref/fate/pcm_dvd
+++ b/tests/ref/fate/pcm_dvd
@@ -1,124 +1,124 @@
 #tb 0: 1/48000
 0,          0,          0,      334,     1336, 0x8e3c0abc
-0,        334,        334,      334,     1336, 0x99c41108
-0,        668,        668,      334,     1336, 0xd65be322
-0,       1002,       1002,      334,     1336, 0x15b575fb
-0,       1336,       1336,      334,     1336, 0x366f742a
-0,       1670,       1670,      334,     1336, 0xed72ad83
-0,       2004,       2004,      334,     1336, 0x73f21c93
-0,       2338,       2338,      334,     1336, 0x4be7a770
-0,       2672,       2672,      334,     1336, 0x69ecf80c
-0,       3006,       3006,      334,     1336, 0x835dc0e5
-0,       3340,       3340,      334,     1336, 0x3089458d
-0,       3674,       3674,      334,     1336, 0xc73b8cdc
-0,       4008,       4008,      334,     1336, 0xc1cdaa8f
-0,       4342,       4342,      334,     1336, 0x47a49186
-0,       4676,       4676,      334,     1336, 0x2db387e2
-0,       5010,       5010,      334,     1336, 0x90da9a97
-0,       5344,       5344,      334,     1336, 0xcd34a467
-0,       5678,       5678,      334,     1336, 0xdca8bd29
-0,       6012,       6012,      334,     1336, 0xa09f9da3
-0,       6346,       6346,      334,     1336, 0x47c8acf6
-0,       6680,       6680,      334,     1336, 0x94dfa20e
-0,       7014,       7014,      334,     1336, 0x2123a5f6
-0,       7348,       7348,      334,     1336, 0x2f1badde
-0,       7682,       7682,      334,     1336, 0x47579528
-0,       8016,       8016,      334,     1336, 0x028daa10
-0,       8350,       8350,      334,     1336, 0x5ed7adcd
-0,       8684,       8684,      334,     1336, 0xc5ee8f10
-0,       9018,       9018,      334,     1336, 0xcfacb489
-0,       9352,       9352,      334,     1336, 0x07de937b
-0,       9686,       9686,      334,     1336, 0x07bd8f8b
-0,      10020,      10020,      334,     1336, 0x4660912e
-0,      10354,      10354,      334,     1336, 0x047f97ad
-0,      10688,      10688,      334,     1336, 0xe0e8a11f
-0,      11022,      11022,      334,     1336, 0xcd9898e6
-0,      11356,      11356,      334,     1336, 0xccfda786
-0,      11690,      11690,      334,     1336, 0xab1b9e40
-0,      12024,      12024,      334,     1336, 0x2ea79ea1
-0,      12358,      12358,      334,     1336, 0xade2ad7e
-0,      12692,      12692,      334,     1336, 0xe5cf9684
-0,      13026,      13026,      334,     1336, 0xb57184cf
+0,        400,        400,      334,     1336, 0x99c41108
+0,        720,        720,      334,     1336, 0xd65be322
+0,       1040,       1040,      334,     1336, 0x15b575fb
+0,       1360,       1360,      334,     1336, 0x366f742a
+0,       1680,       1680,      334,     1336, 0xed72ad83
+0,       2000,       2000,      334,     1336, 0x73f21c93
+0,       2400,       2400,      334,     1336, 0x4be7a770
+0,       2720,       2720,      334,     1336, 0x69ecf80c
+0,       3040,       3040,      334,     1336, 0x835dc0e5
+0,       3360,       3360,      334,     1336, 0x3089458d
+0,       3680,       3680,      334,     1336, 0xc73b8cdc
+0,       4080,       4080,      334,     1336, 0xc1cdaa8f
+0,       4400,       4400,      334,     1336, 0x47a49186
+0,       4720,       4720,      334,     1336, 0x2db387e2
+0,       5040,       5040,      334,     1336, 0x90da9a97
+0,       5360,       5360,      334,     1336, 0xcd34a467
+0,       5680,       5680,      334,     1336, 0xdca8bd29
+0,       6080,       6080,      334,     1336, 0xa09f9da3
+0,       6400,       6400,      334,     1336, 0x47c8acf6
+0,       6720,       6720,      334,     1336, 0x94dfa20e
+0,       7040,       7040,      334,     1336, 0x2123a5f6
+0,       7360,       7360,      334,     1336, 0x2f1badde
+0,       7680,       7680,      334,     1336, 0x47579528
+0,       8080,       8080,      334,     1336, 0x028daa10
+0,       8400,       8400,      334,     1336, 0x5ed7adcd
+0,       8720,       8720,      334,     1336, 0xc5ee8f10
+0,       9040,       9040,      334,     1336, 0xcfacb489
+0,       9360,       9360,      334,     1336, 0x07de937b
+0,       9760,       9760,      334,     1336, 0x07bd8f8b
+0,      10080,      10080,      334,     1336, 0x4660912e
+0,      10400,      10400,      334,     1336, 0x047f97ad
+0,      10720,      10720,      334,     1336, 0xe0e8a11f
+0,      11040,      11040,      334,     1336, 0xcd9898e6
+0,      11360,      11360,      334,     1336, 0xccfda786
+0,      11760,      11760,      334,     1336, 0xab1b9e40
+0,      12080,      12080,      334,     1336, 0x2ea79ea1
+0,      12400,      12400,      334,     1336, 0xade2ad7e
+0,      12720,      12720,      334,     1336, 0xe5cf9684
+0,      13040,      13040,      334,     1336, 0xb57184cf
 0,      13360,      13360,      334,     1336, 0x0668a5ce
-0,      13694,      13694,      334,     1336, 0x643a9d96
-0,      14028,      14028,      334,     1336, 0x97dc8ecc
-0,      14362,      14362,      334,     1336, 0x72c2b174
-0,      14696,      14696,      334,     1336, 0xe39d8fc3
-0,      15030,      15030,      334,     1336, 0x56fc76d2
-0,      15364,      15364,      334,     1336, 0x91a884b3
-0,      15698,      15698,      334,     1336, 0x7b039a4e
-0,      16032,      16032,      334,     1336, 0x3770a9dd
-0,      16366,      16366,      334,     1336, 0x317c9cb8
-0,      16700,      16700,      334,     1336, 0xdd97ad48
-0,      17034,      17034,      334,     1336, 0x98066c1b
-0,      17368,      17368,      334,     1336, 0xecd3a31c
-0,      17702,      17702,      334,     1336, 0x0578b329
-0,      18036,      18036,      334,     1336, 0x6942881c
-0,      18370,      18370,      334,     1336, 0x56b5af29
-0,      18704,      18704,      334,     1336, 0xf111a48a
-0,      19038,      19038,      334,     1336, 0x1f5a8d45
-0,      19372,      19372,      334,     1336, 0x39abdded
-0,      19706,      19706,      334,     1336, 0xdb997fe8
-0,      20040,      20040,      334,     1336, 0xd7f0d0b2
-0,      20374,      20374,      334,     1336, 0xf3219413
-0,      20708,      20708,      334,     1336, 0x9d80899d
-0,      21042,      21042,      334,     1336, 0x7238bd63
-0,      21376,      21376,      334,     1336, 0x7376703e
-0,      21710,      21710,      334,     1336, 0x0fd56d02
-0,      22044,      22044,      334,     1336, 0xa6c0951e
-0,      22378,      22378,      334,     1336, 0xfacb674e
-0,      22712,      22712,      334,     1336, 0x805bd289
-0,      23046,      23046,      334,     1336, 0xa2a51a12
-0,      23380,      23380,      334,     1336, 0x8a75d91b
-0,      23714,      23714,      334,     1336, 0x34b1ef80
-0,      24048,      24048,      334,     1336, 0x902921e0
-0,      24382,      24382,      334,     1336, 0xc2db7895
-0,      24716,      24716,      334,     1336, 0x7a0db9e1
-0,      25050,      25050,      334,     1336, 0x66a93277
-0,      25384,      25384,      334,     1336, 0x30830a83
-0,      25718,      25718,      334,     1336, 0x251cf132
-0,      26052,      26052,      334,     1336, 0x08dd852c
-0,      26386,      26386,      334,     1336, 0x22ea164c
+0,      13760,      13760,      334,     1336, 0x643a9d96
+0,      14080,      14080,      334,     1336, 0x97dc8ecc
+0,      14400,      14400,      334,     1336, 0x72c2b174
+0,      14720,      14720,      334,     1336, 0xe39d8fc3
+0,      15040,      15040,      334,     1336, 0x56fc76d2
+0,      15360,      15360,      334,     1336, 0x91a884b3
+0,      15760,      15760,      334,     1336, 0x7b039a4e
+0,      16080,      16080,      334,     1336, 0x3770a9dd
+0,      16400,      16400,      334,     1336, 0x317c9cb8
+0,      16720,      16720,      334,     1336, 0xdd97ad48
+0,      17040,      17040,      334,     1336, 0x98066c1b
+0,      17440,      17440,      334,     1336, 0xecd3a31c
+0,      17760,      17760,      334,     1336, 0x0578b329
+0,      18080,      18080,      334,     1336, 0x6942881c
+0,      18400,      18400,      334,     1336, 0x56b5af29
+0,      18720,      18720,      334,     1336, 0xf111a48a
+0,      19040,      19040,      334,     1336, 0x1f5a8d45
+0,      19440,      19440,      334,     1336, 0x39abdded
+0,      19760,      19760,      334,     1336, 0xdb997fe8
+0,      20080,      20080,      334,     1336, 0xd7f0d0b2
+0,      20400,      20400,      334,     1336, 0xf3219413
+0,      20720,      20720,      334,     1336, 0x9d80899d
+0,      21040,      21040,      334,     1336, 0x7238bd63
+0,      21440,      21440,      334,     1336, 0x7376703e
+0,      21760,      21760,      334,     1336, 0x0fd56d02
+0,      22080,      22080,      334,     1336, 0xa6c0951e
+0,      22400,      22400,      334,     1336, 0xfacb674e
+0,      22720,      22720,      334,     1336, 0x805bd289
+0,      23120,      23120,      334,     1336, 0xa2a51a12
+0,      23440,      23440,      334,     1336, 0x8a75d91b
+0,      23760,      23760,      334,     1336, 0x34b1ef80
+0,      24080,      24080,      334,     1336, 0x902921e0
+0,      24400,      24400,      334,     1336, 0xc2db7895
+0,      24720,      24720,      334,     1336, 0x7a0db9e1
+0,      25120,      25120,      334,     1336, 0x66a93277
+0,      25440,      25440,      334,     1336, 0x30830a83
+0,      25760,      25760,      334,     1336, 0x251cf132
+0,      26080,      26080,      334,     1336, 0x08dd852c
+0,      26400,      26400,      334,     1336, 0x22ea164c
 0,      26720,      26720,      334,     1336, 0x3bdd91c4
-0,      27054,      27054,      334,     1336, 0xa4c0fbd7
-0,      27388,      27388,      334,     1336, 0x83aa81bd
-0,      27722,      27722,      334,     1336, 0x8a7b0fdb
-0,      28056,      28056,      334,     1336, 0x35c37b01
-0,      28390,      28390,      334,     1336, 0xdede811e
-0,      28724,      28724,      334,     1336, 0x7473a657
-0,      29058,      29058,      334,     1336, 0x5b917e2b
-0,      29392,      29392,      334,     1336, 0x1c5a7cfc
-0,      29726,      29726,      334,     1336, 0xeb7bab0d
-0,      30060,      30060,      334,     1336, 0x7337795c
-0,      30394,      30394,      334,     1336, 0x68da9d08
-0,      30728,      30728,      334,     1336, 0xe93b87fe
-0,      31062,      31062,      334,     1336, 0xd4639f00
-0,      31396,      31396,      334,     1336, 0x1070a91d
-0,      31730,      31730,      334,     1336, 0x50e3788f
-0,      32064,      32064,      334,     1336, 0x1dac6691
-0,      32398,      32398,      334,     1336, 0xf62c709d
-0,      32732,      32732,      334,     1336, 0x2369648d
-0,      33066,      33066,      334,     1336, 0xbfc792e6
-0,      33400,      33400,      334,     1336, 0x975eb8e3
-0,      33734,      33734,      334,     1336, 0x35c49ba6
-0,      34068,      34068,      334,     1336, 0xe6198aa9
-0,      34402,      34402,      334,     1336, 0x99f37d9d
-0,      34736,      34736,      334,     1336, 0x4815aff1
-0,      35070,      35070,      334,     1336, 0x4fd366ca
-0,      35404,      35404,      334,     1336, 0x43cf7bb4
-0,      35738,      35738,      334,     1336, 0x14a576ac
-0,      36072,      36072,      334,     1336, 0xc6986978
-0,      36406,      36406,      334,     1336, 0x10f67dc4
-0,      36740,      36740,      334,     1336, 0xcca07f7a
-0,      37074,      37074,      334,     1336, 0x6d0a5dfe
-0,      37408,      37408,      334,     1336, 0x4e0761ef
-0,      37742,      37742,      334,     1336, 0x31368e66
-0,      38076,      38076,      334,     1336, 0x14b895c1
-0,      38410,      38410,      334,     1336, 0x4bb7c111
-0,      38744,      38744,      334,     1336, 0x1676a8bb
-0,      39078,      39078,      334,     1336, 0xddaaa459
-0,      39412,      39412,      334,     1336, 0xc43eabce
-0,      39746,      39746,      334,     1336, 0x4d9f8d54
+0,      27120,      27120,      334,     1336, 0xa4c0fbd7
+0,      27440,      27440,      334,     1336, 0x83aa81bd
+0,      27760,      27760,      334,     1336, 0x8a7b0fdb
+0,      28080,      28080,      334,     1336, 0x35c37b01
+0,      28400,      28400,      334,     1336, 0xdede811e
+0,      28720,      28720,      334,     1336, 0x7473a657
+0,      29120,      29120,      334,     1336, 0x5b917e2b
+0,      29440,      29440,      334,     1336, 0x1c5a7cfc
+0,      29760,      29760,      334,     1336, 0xeb7bab0d
+0,      30080,      30080,      334,     1336, 0x7337795c
+0,      30400,      30400,      334,     1336, 0x68da9d08
+0,      30800,      30800,      334,     1336, 0xe93b87fe
+0,      31120,      31120,      334,     1336, 0xd4639f00
+0,      31440,      31440,      334,     1336, 0x1070a91d
+0,      31760,      31760,      334,     1336, 0x50e3788f
+0,      32080,      32080,      334,     1336, 0x1dac6691
+0,      32400,      32400,      334,     1336, 0xf62c709d
+0,      32800,      32800,      334,     1336, 0x2369648d
+0,      33120,      33120,      334,     1336, 0xbfc792e6
+0,      33440,      33440,      334,     1336, 0x975eb8e3
+0,      33760,      33760,      334,     1336, 0x35c49ba6
+0,      34080,      34080,      334,     1336, 0xe6198aa9
+0,      34400,      34400,      334,     1336, 0x99f37d9d
+0,      34800,      34800,      334,     1336, 0x4815aff1
+0,      35120,      35120,      334,     1336, 0x4fd366ca
+0,      35440,      35440,      334,     1336, 0x43cf7bb4
+0,      35760,      35760,      334,     1336, 0x14a576ac
+0,      36080,      36080,      334,     1336, 0xc6986978
+0,      36480,      36480,      334,     1336, 0x10f67dc4
+0,      36800,      36800,      334,     1336, 0xcca07f7a
+0,      37120,      37120,      334,     1336, 0x6d0a5dfe
+0,      37440,      37440,      334,     1336, 0x4e0761ef
+0,      37760,      37760,      334,     1336, 0x31368e66
+0,      38080,      38080,      334,     1336, 0x14b895c1
+0,      38480,      38480,      334,     1336, 0x4bb7c111
+0,      38800,      38800,      334,     1336, 0x1676a8bb
+0,      39120,      39120,      334,     1336, 0xddaaa459
+0,      39440,      39440,      334,     1336, 0xc43eabce
+0,      39760,      39760,      334,     1336, 0x4d9f8d54
 0,      40080,      40080,      334,     1336, 0x0ac292cb
-0,      40414,      40414,      334,     1336, 0x2d9c74e4
-0,      40748,      40748,      334,     1336, 0xe73da38f
+0,      40480,      40480,      334,     1336, 0x2d9c74e4
+0,      40800,      40800,      334,     1336, 0xe73da38f