With minor changes by michael
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This fixes aspect handling in ffmpeg
This is based on a patch by baptiste

445996aa caused the PMT PID to be
off by one.  This corrects it.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 740ad0d1)

This is consistent with most of the other attribute macros.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 365e3c78)

Around 01/28/11 18:56, Ronald S. Bultje scribbled:
> That patch is now merged, can you submit the update to muxers.texi?
> Then we'll apply the whole thing.

See attached. I hope the documentation is enough.

--
Georgi Chorbadzhiyski
http://georgi.unixsol.org/

From c236024b8254f5c2c45934c30fff390cb0e55a5e Mon Sep 17 00:00:00 2001
From: Georgi Chorbadzhiyski <gf@unixsol.org>
Date: Tue, 25 Jan 2011 13:09:17 +0200
Subject: [PATCH] mpegts: Replace defines in with AVOptions

This patch adds support for setting transport_stream_id,
original_network_id, service_id, pmt_start_pid and start_pid
in mpegts muxer.
Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 445996aa)

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit e771d2e3)

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 22e9277a)

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 45430099)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fa34a362)

Merge an if and a switch.
(cherry picked from commit 73be29b0)

AVCodecContext.reordered_opaque is deprecated for this specific use.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 28550804)

Disable logging of rescaled timestamps if DEBUG is not enabled.
Avoid debug log spamming with -loglevel debug.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 13156f40)

Signed-off-by: Vasyl' Vavrychuk <vvavrychuk@gmail.com>
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 665132e6)

(cherry picked from commit d33ed7b3)

dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005)

Gives decoded output identical in length to faac commandline encoder.
Fixes Issue 670.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 243f8241)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e0eb963a)

This moves the fields needed by asm near the top, before any
structs or other members which complicate the offset calculation.
Modifying other structs will no longer require updating the offsets,
and the asm code is slightly simpler due to the smaller offsets.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d461a473)

The generated HTML files are similar to the ones generated with
texi2html 1.56k used on the website.

Tested with texi2html 1.78 and 5.0. 1.78 is the minimal recommended
version.

The removed @sp from the titlepage section were ignored until
texi2html 5.0. If not removed the pages generated by 5.0 will have ugly
empty space around the title.
(cherry picked from commit a8f0814a)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3af1fe82)

(cherry picked from commit 0745116c)

(cherry picked from commit 2e279598)

From ~780 cycles to 551 cycles, mostly just by using libc memcpy()
instead of manually shuffling individual bytes around.
(cherry picked from commit e5262ec4)

$subject. Have used this for loopback testing with mpegts.c.

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
[2. text/x-diff; 0001-mpegtsenc-support-CODEC_ID_AAC_LATM.patch]

From 0f7f9db4b7da1793996af6dda84298507703759a Mon Sep 17 00:00:00 2001
From: Peter Ross <pross@xvid.org>
Date: Sun, 9 Jan 2011 09:45:50 +1100
Subject: [PATCH] mpegtsenc: support CODEC_ID_AAC_LATM
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 4d54df8e)

fix compile on OS/2
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a0788cc6)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 04295054)

poll() is only used by networking code, so the fallback should
only be built if networking is enabled.  Also remove CONFIG_FFSERVER
condition from the declarations.

This should fix building on systems without poll(), broken
by a8475bbd.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 362d8f7d)

Add an error message in case the user requests to write more than one file
and the path does not contain a "%d" or "%0Nd" pattern.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 4fc9ff0a)

The output was changed by a7827a17.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 79dca23d)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e5c82df8)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 85466e1e)

According to EN 300 468 section 3.1 (Definitions):

   Unless otherwise specified within the present document all
   "reserved_future_use" bits is set to "1".

This was not the case for SDT generation so this patch fixes it.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit a7827a17)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3c802cab)

In the start_frame() debug log, print the reference pos value rather than the evaluated value converted to int.

That's required because -1 is evaluated as NAN, which converted back
to int looks like a random number, this is especially annoying when
debugging sources with undefined pos (as the video4linux2 device).
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3e5bc7ff)

Replace * (uint32_t *) buf accesses with AV_WN32A/AV_COPY32.
(cherry picked from commit 9d4bdcb7)

the sdp demuxer did not forward it at all while the rtsp demuxer assumed
a single kind of error
(cherry picked from commit f81c7ac7)