Michael Niedermayer
d641ee94b5
lavf: Fix assignments in if()
...
Signed-off-by: Martin Storsjö <martin@martin.st>
2013-01-14 13:12:55 +02:00
Michael Niedermayer
1ac5a8d7e3
lavf/mux: Fix assignments in if()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-14 05:05:41 +01:00
Clément Bœsch
119d70db50
lavf/mux: do not pass a copy of the packet to write_packet().
...
Sometimes the muxer modifies the packet, like for instance lavf/mp3enc
changing pkt->destruct in order to keep a copy. These changes must be
kept, even though the muxer behaviour is questionable. Regression since
0072116Fixes #2124 .
2013-01-08 23:21:05 +01:00
Clément Bœsch
0072116ccb
lavf: split packets before muxing.
...
After demuxing, data and side are merged. Before decoding, they are
split. Encoder will perform with data and side split. This means that a
muxer can receive split data (after encoding) but also merged data (if
called directly after demuxing). This commit makes sure data and side
are split for the muxer.
2012-12-20 16:13:52 +01:00
Michael Niedermayer
f2a7e1a62b
mux: change 1 assert->av_assert1()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-07 23:31:27 +02:00
Michael Niedermayer
5e6439a125
ff_choose_timebase: only try factors upto 14
...
otherwise a unexpected timebase could be choosen
that is one that is thousand times more precisse than requested
which can have sideeffects.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-03 21:38:56 +02:00
Michael Niedermayer
de707bc8bd
mux/nut: factorize ff_choose_timebase() out of nut
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-03 21:34:43 +02:00
Michael Niedermayer
dd78e1090b
Merge commit '1e46c63eb72be752e044ba32257d77f35cbd9dac'
...
* commit '1e46c63eb72be752e044ba32257d77f35cbd9dac':
avformat: refactor avformat_write_header
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02 18:48:56 +02:00
Michael Niedermayer
6cbbf4a274
Merge commit '86bbdf865e04bc5ddc2021b0620e6de634375253'
...
* commit '86bbdf865e04bc5ddc2021b0620e6de634375253':
avformat: refactor avformat_write_header
Conflicts:
libavformat/mux.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02 18:36:09 +02:00
Michael Niedermayer
513042c926
Merge commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd'
...
* commit '55f9037f38bc3beacb2f5a17408c1d24c077d7fd':
avformat: split muxing functions from util.c
Conflicts:
libavformat/internal.h
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-02 18:20:24 +02:00
Luca Barbato
1e46c63eb7
avformat: refactor avformat_write_header
...
Split away option settings, sanity checks and general setup.
2012-10-01 19:57:57 +02:00
Luca Barbato
86bbdf865e
avformat: refactor avformat_write_header
...
Mostly cosmetic changes adding some intermediate to shorten the lines.
2012-10-01 19:57:57 +02:00
Luca Barbato
55f9037f38
avformat: split muxing functions from util.c
2012-10-01 19:57:57 +02:00
