08fe58ef32
ffmpeg: Clear error message array at init.
...
This avoids printing uninitialized bytes if no error message is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6d1a2efb8a
2015-01-08 23:11:00 +01:00
14f31df2cc
ffmpeg: Fix forcing of the framerate for stream copy on input
...
Fixes Ticket2211
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 356363c898
2013-11-29 11:27:12 +01:00
ffd28de388
ffmpeg: free threads on error conditions.
...
Fixes Ticket2562
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1a36c756d8
2013-05-17 23:21:43 +02:00
199db97fbd
Close output codecs if input codec initialisation fails.
...
Fixes ticket #1546 and the remaining part of ticket #1244 .
2013-03-08 02:46:46 +01:00
8cc5481d51
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
lavc: Deprecate the deinterlace functions in libavcodec
h264: Integrate draw_horiz_band into ff_h264_draw_horiz_band
Conflicts:
configure
ffmpeg_opt.c
libavcodec/avcodec.h
libavcodec/h264.c
libavcodec/imgconvert.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-07 11:50:17 +01:00
2cffe38df3
Deprecate deinterlaced in libavcodec.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03 21:11:48 +01:00
9af8179cdb
ffmpeg: fix -stats -v 0
...
Fixes Ticket1687
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-03 19:38:13 +01:00
4ae74c6312
ffmpeg: print maxrss "-benchmark" data even on errors
...
Fixes Ticket2297
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-02 16:04:49 +01:00
41401773d3
Merge commit 'df0229a7caa124dcfb84c34b48d316744c467311'
...
* commit 'df0229a7caa124dcfb84c34b48d316744c467311':
avconv: Apply codec options to streams that are copied as well
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 12:57:17 +01:00
e20f2dc048
ffmpeg: fix variable name in psnr printing code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-01 00:25:03 +01:00
f102c24d90
ffmpeg: free last sub when using -fix_sub_duration.
...
Fix trac ticket #2242 .
Note: under valid circumstances, when using -fix_sub_duration,
the last subtitle is a dummy termination packet, with no
allocated memory.
2013-02-27 18:57:33 +01:00
ad899522ff
ffmpeg: use a AVDictionary instead of the context to move swr parameters around
...
This avoids per parameter changes in ffmpeg at the cost of making access
somewhat more annoying.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 20:31:56 +01:00
6db37c9468
Merge commit '5c7db097ebe1fb5c233cedd8846615074e7d6044'
...
* commit '5c7db097ebe1fb5c233cedd8846615074e7d6044':
avconv: pass libavresample options to AVFilterGraph
Conflicts:
cmdutils.c
cmdutils.h
ffmpeg_filter.c
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-24 17:41:31 +01:00
c3fb20bab4
ffmpeg: Check for parameter changes at the output of the audio filter graph
...
It is currently possible that such changes leak through from the decoder as
well as a filter could generate such changes itself.
This commit blocks such changed packets unless the encoder declares support.
Fixes out of array reads
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-14 23:56:51 +01:00
3b1f037df5
ffmpeg: fix streamcopy of lsf mp3.
...
Fixes streamcopy of bear_mpeg4_mp3.avi
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-12 00:38:22 +01:00
127ff88639
ffmpeg: do not call exit from exit_program()
...
This should fix Ticket2116
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-02-06 04:03:52 +01:00
43af18ef8b
ffmpeg: implement -force_key_frames expression evalution
2013-01-27 16:56:47 +01:00
41f025dff0
ffmpeg: support filtering of unknown channel layouts.
2013-01-26 11:15:38 +01:00
fccd8c21c4
ffmpeg: add -guess_layout_max option.
2013-01-26 11:15:38 +01:00
bee044d7c2
ffmpeg: copy tmcd track timebase parameters
...
Fixes part of Ticket2045
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-24 18:37:32 +01:00
144529e094
Merge commit 'd9bf716945046333c24580d538f450b516f15710'
...
* commit 'd9bf716945046333c24580d538f450b516f15710':
ppc: vorbisdsp: Drop some unnecessary #includes
avconv: Increase the SDP buffer size to fit xiph SDPs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-21 14:10:32 +01:00
beb5d8f07d
ffmpeg: accept "chapters" as forced key frames.
...
Allow to force a key frame at the beginning of each chapter.
2013-01-19 15:22:34 +01:00
9a038a95d2
Use new function av_codec_get_tag2() in ffmpeg.c.
...
Fixes ticket #1953 .
2013-01-17 20:46:21 +01:00
40648d8cc3
add note on windows pipe
...
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-06 17:47:49 +01:00
750382d5c8
ffmpeg: remove annoying logs and improve reporting in case of unavailable bitrate
2012-12-27 15:47:15 +01:00
af4b1c02ac
Merge commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06'
...
* commit '77bd1bc73a1946b0f0ce09a7cbb242a65e138d06':
avconv: use new options parser.
Conflicts:
ffmpeg.c
ffmpeg.h
ffmpeg_opt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-20 02:38:02 +01:00
c4a32d92fe
ffmpeg: Fix shortest with libx264
...
Encoders that buffer a significant number of frames where a "few"
frames off with -shortest
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-19 00:08:37 +01:00
c16f768d73
ffmpeg: replace magic number with VSYNC_CFR
2012-12-16 09:48:54 +11:00
0f236345fb
ffmpeg: sub2video: use start and end time.
...
Until now, the end_display_time was ignored, making single
packets subtitles (like dvdsub) stay indefinitely.
start_display_time was also ignored, but is it almost always 0.
2012-12-12 15:05:50 +01:00
3b1b8f88b7
ffmpeg: small indent fix.
2012-12-04 16:40:11 +01:00
60c2cddff0
ffmpeg: use the correct variables in do_video_stats()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-04 16:36:09 +01:00
e98fab1372
Update video stats log during encode flush
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-12-04 16:36:09 +01:00
66244baf1d
ffmpeg: fix mixed declarations and statements.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24 03:02:11 +01:00
d92073ac93
ffmpeg: Correct starttime based on non discarded streams.
...
Fixes Ticket1830
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24 01:54:49 +01:00
fe97bf60b8
ffmpeg: minor simplification of wraping code
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-24 01:34:26 +01:00
dcbf72836c
ffmpeg: add setting of field_order flag
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-22 05:30:43 +01:00
3a0f3ffe8e
ffmpeg: fix weird reindent
2012-11-22 00:13:14 +01:00
02b4ae0427
ffmpeg: print debug_ts off and off_time values with timestamp helper routines
2012-11-22 00:13:14 +01:00
9ccc349f77
ensure comment blocks that contain doxygen commands start with double asterix
...
Reveiwed-by: Stefano Sabatini <stefasab@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-21 23:55:15 +01:00
3d52083a27
ffmpeg: rework debugging timestamp logs in process_input()
...
Print timestamps before and after ffmpeg timestamp postprocessing.
Help to debug how ffmpeg processes the input timestamps.
2012-11-20 22:48:28 +01:00
9f088712d4
ffmpeg: fix double ;;
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 02:06:50 +01:00
9406d6be55
ffmpeg: fix audio timestamps on stream copy with -ss
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-14 01:42:33 +01:00
03b078721c
Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'
...
* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
doc: git-howto: Leave reviewers time to react before pushing patches
Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h
Conflicts:
doc/APIchanges
doc/examples/decoding_encoding.c
doc/git-howto.texi
ffmpeg_filter.c
libavcodec/flacdec.c
libavcodec/imc.c
libavcodec/mpegaudiodec.c
libavcodec/utils.c
libavfilter/asrc_anullsrc.c
libavfilter/audio.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavfilter/avfiltergraph.c
libavfilter/buffer.c
libavutil/Makefile
libavutil/audioconvert.h
libavutil/channel_layout.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-12 11:32:11 +01:00
98cbbabadb
Fix the packet duration when flushing the encoder.
...
A similar patch was posted by Justin Ruggles <justin.ruggles@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-07 22:29:11 +01:00
37e81996dc
Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'
...
* commit '9221efef7968463f3e3d9ce79ea72eaca082e73f':
lavf: fix av_interleaved_write_frame() doxy.
lavf: clarify the lifetime of demuxed packets.
avconv: do not free muxed packet on streamcopy.
crc: move doxy to the header
vf_drawtext: do not use deprecated av_tree_node_size
x86: Refactor PSWAPD fallback implementations and port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-11-03 14:24:11 +01:00
cd37963684
Merge commit '381dc1a5ec0925b281c573457c413ae643567086'
...
* commit '381dc1a5ec0925b281c573457c413ae643567086':
fate: ac3: Place E-AC-3 tests and AC-3 tests in different groups
fate: Add shorthands for acodec PCM and ADPCM tests
avconv: Drop unused function argument from do_video_stats()
cmdutils: Conditionally compile libswscale-related bits
aacenc: Drop some unused function arguments
rtsp: Avoid a cast when calling strtol
nut: support textual data
nutenc: verbosely report unsupported negative pts
Conflicts:
cmdutils.c
ffmpeg.c
libavformat/nut.c
libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-30 13:52:03 +01:00
1909dbf11d
ffmpeg: use av_rescale_delta() for audio stream copy
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 04:01:31 +02:00
a9d97e1b0a
ffmpeg: use av_rescale_delta() on the audio filter input
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 00:26:35 +02:00
03e44bcb3f
ffmpeg: trivial simplification
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-27 00:26:35 +02:00
507f2940cc
Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'
...
* commit '1b891d17c531e8a63c2974aab4bf997ce70746f3':
avconv: fix bitrate report when writing to /dev/null
avfilter: fix graphparser memleaks on error paths
rawdec: remove ff_raw_read_header
pcmdec: remove dependency from rawdec
g722: refactor out of rawdec.c
rawvideo: use a specific read_header
Conflicts:
ffmpeg.c
libavformat/Makefile
libavformat/rawdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-26 14:24:57 +02:00
Michael Niedermayer
Carl Eugen Hoyos
Ronald S. Bultje
Nicolas George
Stefano Sabatini
rogerdpack
Peter Ross
Clément Bœsch
Thierry Foucu
Tim Nicholson