* qatar/master: (23 commits) build: cosmetics: Reorder some lists in a more logical fashion x86: pngdsp: Fix assembly for OS/2 fate: add test for RTjpeg in nuv with frameheader rtmp: send check_bw as notification g723_1: clip argument for 15-bit version of normalize_bits() g723_1: use all LPC vectors in formant postfilter id3v2: Support v2.2 PIC avplay: fix build with lavfi disabled. avconv: split configuring filter configuration to a separate file. avconv: split option parsing into a separate file. mpc8: do not leave padding after last frame in buffer for the next decode call mpegaudioenc: list supported channel layouts. mpegaudiodec: don't print an error on > 1 frame in a packet. api-example: update to new audio encoding API. configure: add --enable/disable-random option doc: cygwin: Update list of FATE package requirements build: Remove all installed headers and header directories on uninstall build: change checkheaders to use regular build rules rtmp: Add a new option 'rtmp_subscribe' rtmp: Add support for subscribing live streams ... Conflicts: Makefile common.mak configure doc/examples/decoding_encoding.c ffmpeg.c libavcodec/g723_1.c libavcodec/mpegaudiodec.c libavcodec/x86/pngdsp.asm libavformat/version.h library.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
		
			
				
	
	
		
			11 lines
		
	
	
		
			538 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
			
		
		
	
	
			11 lines
		
	
	
		
			538 B
		
	
	
	
		
			Plaintext
		
	
	
	
	
	
| #tb 0: 100/2997
 | |
| 0,          4,          4,        1,   460800, 0x54aedafe
 | |
| 0,          5,          5,        1,   460800, 0xb7aa8b56
 | |
| 0,          6,          6,        1,   460800, 0x283ea3b5
 | |
| 0,          7,          7,        1,   460800, 0x283ea3b5
 | |
| 0,          8,          8,        1,   460800, 0x10e577de
 | |
| 0,          9,          9,        1,   460800, 0x4e091ee2
 | |
| 0,         10,         10,        1,   460800, 0x2ea88828
 | |
| 0,         11,         11,        1,   460800, 0x4b7f4df0
 | |
| 0,         12,         12,        1,   460800, 0xa57f20d0
 |