Header elision muxing support.

This only removes 2 bytes from MP3 and MP2 currently.
Up to 4 could be removed from MP3/MP2 though this might need a 2pass muxer.
Primitive code to remove headers from MPEG-1/2/4 is there too but for the
single file I tried it on (the one in the regression tests), it was a loss
because all video frames were >4096 byte, so that it is disabled ATM.

Originally committed as revision 11936 to svn://svn.ffmpeg.org/ffmpeg/trunk

2 files changed, 29 insertions, 29 deletions

diff --git a/tests/libav.regression.ref b/tests/libav.regression.ref
index 4791dc09b4..edee7aec09 100644
--- a/tests/libav.regression.ref
+++ b/tests/libav.regression.ref
@@ -30,8 +30,8 @@ f8ad5bd78f4d012a8ce9570aa395ac54 *./tests/data/b-libav.flv
 2ba41cf880aa5cb87e8a08fdb735398d *./tests/data/b-libav.gxf
 814640 ./tests/data/b-libav.gxf
 ./tests/data/b-libav.gxf CRC=0xa376c09e
-868101eb2d9f8fe128f84399d450633e *./tests/data/b-libav.nut
-329785 ./tests/data/b-libav.nut
+7e8f5cfb9c1c0ac60260a10e2f72f3ea *./tests/data/b-libav.nut
+329347 ./tests/data/b-libav.nut
 ./tests/data/b-libav.nut CRC=0x400c29e9
 43238b15f1012aa27536c2be20bb2383 *./tests/data/b-libav.mkv
 329854 ./tests/data/b-libav.mkv
diff --git a/tests/seek.regression.ref b/tests/seek.regression.ref
index 5bd80d3508..f1d9f97a8c 100644
--- a/tests/seek.regression.ref
+++ b/tests/seek.regression.ref
@@ -3193,59 +3193,59 @@ ret: 0 st:-1 ts:-0.645825 flags:1
 ret: 0 st: 1 dts:0.500000 pts:0.500000 pos:-1 size:208 flags:1
 ----------------
 tests/data/b-libav.nut
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:-1.000000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:1.894167 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 0 ts:0.800000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 0 ts:-0.320000 flags:1
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 1 ts:2.586122 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 1 ts:1.462857 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st:-1 ts:0.365002 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:-0.740831 flags:1
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 0 ts:2.160000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 0 ts:1.040000 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 1 ts:-0.052245 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 1 ts:2.847347 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st:-1 ts:1.730004 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st:-1 ts:0.624171 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 0 ts:-0.480000 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 0 ts:2.400000 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 1 ts:1.306122 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 1 ts:0.208980 flags:1
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:-0.904994 flags:0
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st:-1 ts:1.989173 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 0 ts:0.880000 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 0 ts:-0.240000 flags:1
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ret: 0 st: 1 ts:2.664490 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st: 1 ts:1.567347 flags:1
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st:-1 ts:0.460008 flags:0
-ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149135 size:27412 flags:1
+ret: 0 st: 0 dts:0.480000 pts:0.480000 pos:149133 size:27412 flags:1
 ret: 0 st:-1 ts:-0.645825 flags:1
-ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:243 size:28088 flags:1
+ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:279 size:28088 flags:1
 ----------------
 tests/data/b-libav.ogg
 ret: 0 st: 0 dts:0.000000 pts:0.000000 pos:-1 size:2352 flags:1