Commit Graph

8059 Commits

Author SHA1 Message Date
Michael Niedermayer
a8062103dd command line option to select the audio stream
Originally committed as revision 7665 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 14:07:11 +00:00
Michael Niedermayer
2f29af3952 flame
Originally committed as revision 7664 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 13:42:09 +00:00
Luca Abeni
2d529db50f Pass a context to av_log(), when possible
Originally committed as revision 21999 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-23 13:41:45 +00:00
Michael Niedermayer
6f9ca74bec check num_reorder_frames for validity
increase delayed_pic buffer size (one temporary is used and a terminating NULL is assumed by most code so it has to be 18 large)

Originally committed as revision 7663 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 13:36:56 +00:00
Baptiste Coudurier
bd31a388db AVOption is now const, removes a few warnings
Originally committed as revision 7662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 13:04:13 +00:00
Michael Niedermayer
9170e34537 adding assert to protect delayed_pic
Originally committed as revision 7661 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 12:45:57 +00:00
Luca Barbato
6847e61af3 10l, there is a corner case afterall...
Originally committed as revision 7660 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 12:04:48 +00:00
Michel Bardiaux
373c32c711 Fix wrong comment, patch by Michel Bardiaux mbardiaux mediaxim be.
Originally committed as revision 7659 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-23 09:24:41 +00:00
Michael Niedermayer
b34397b4cd 1/0 fix
Originally committed as revision 7658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 22:27:02 +00:00
Michael Niedermayer
f7835507cb consistant error return for asf_get_packet()
Originally committed as revision 7657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:38:33 +00:00
Michael Niedermayer
92216453db better padsize check
Originally committed as revision 7656 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:33:26 +00:00
Michael Niedermayer
0b93103a31 more correct error message
Originally committed as revision 7655 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:31:40 +00:00
Michael Niedermayer
ceba96cb26 replace wrong return 0 by -1
Originally committed as revision 7654 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:28:56 +00:00
Michael Niedermayer
13f7e4b966 check to detect nonsense fragment size
Originally committed as revision 7653 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 21:17:54 +00:00
Michael Niedermayer
1ae7518dda inden(ta)tion
Originally committed as revision 7652 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 17:06:46 +00:00
Michael Niedermayer
200026aae4 replace nonsense code by something which makes at least some sense
Originally committed as revision 7651 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 17:01:01 +00:00
Michael Niedermayer
4c71d72701 check fragment offset and size
yes this too could have been exploitable ...

Originally committed as revision 7650 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 16:37:45 +00:00
Michael Niedermayer
ae60a85780 move frame header reading into its own function
Originally committed as revision 7649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 12:55:23 +00:00
Michael Niedermayer
b04d5d3116 more correct packet alignment check and correction
Originally committed as revision 7648 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 12:52:49 +00:00
Michael Niedermayer
5e2a485507 10l
Originally committed as revision 7647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 12:33:10 +00:00
Michael Niedermayer
4c6f7440af doxygenize comments
Originally committed as revision 7646 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 11:15:30 +00:00
Michael Niedermayer
4e15cc8ba3 cosmetics (aligne stuff nicely)
Originally committed as revision 7645 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 11:04:55 +00:00
Michael Niedermayer
d045b8c14b get rid of some sensless malloc/free
Originally committed as revision 7644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 11:03:47 +00:00
Michael Niedermayer
916bb12c90 simplify
Originally committed as revision 7643 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 11:01:27 +00:00
Michael Niedermayer
6bb2a2dfb9 remove a few unused and duplicated variables
Originally committed as revision 7642 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 10:53:57 +00:00
Baptiste Coudurier
079e8cb962 do not override rc_buffer_occupancy if set
Originally committed as revision 7641 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 10:01:14 +00:00
Michael Niedermayer
0521946359 adding a few checks to the audio packet descrambling, this should hopefully catch all related out of array accesses
note, the original code might have been exploitable

Originally committed as revision 7640 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 03:19:00 +00:00
Diego Biurrun
2c86a5786a Fix license headers and FSF postal address.
Originally committed as revision 21994 to svn://svn.mplayerhq.hu/mplayer/trunk/libswscale
2007-01-22 01:21:36 +00:00
Michael Niedermayer
b83e83b915 cosmetic
Originally committed as revision 7639 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 01:21:16 +00:00
Diego Biurrun
98cc3cea33 Fix FSF postal address.
Originally committed as revision 7638 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 01:18:33 +00:00
Diego Biurrun
9688979c51 Fix some more license headers.
Originally committed as revision 7637 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 01:16:42 +00:00
Michael Niedermayer
fc9eb13732 these variables seem to be unused on the demuxer side so theres no sense in setting them
Originally committed as revision 7636 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-22 00:20:58 +00:00
Aurelien Jacobs
3fb2ff0be2 fix a typo in deps
Originally committed as revision 7635 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 23:42:58 +00:00
Diego Biurrun
6718659c0f Remove BeOS hack.
Originally committed as revision 7634 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 23:27:30 +00:00
Diego Biurrun
5577eafa21 Clarify that Xvid is used for encoding only.
Originally committed as revision 7633 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 23:04:29 +00:00
Michael Niedermayer
236116cb4c get rid of a few idiotic asserts()
Originally committed as revision 7632 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 23:03:09 +00:00
Michael Niedermayer
b586d9eac3 useless &0x80
Originally committed as revision 7631 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:46:14 +00:00
Diego Biurrun
7ce6a249c7 cosmetics: Sort decoder/encoder/parser variables lists.
Originally committed as revision 7630 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:45:18 +00:00
Aurelien Jacobs
773be23aa7 flashsv encoder also depends on zlib
Originally committed as revision 7629 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:45:14 +00:00
Aurelien Jacobs
4014fe37a3 remove now useless codec_tag setting code in voc muxer
Originally committed as revision 7628 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:41:37 +00:00
Måns Rullgård
bf60f563aa remove the last #ifdef from allcodecs.c
Originally committed as revision 7627 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:31:52 +00:00
Diego Biurrun
ec23a8cb73 cosmetics: List all encoders together.
Originally committed as revision 7626 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:20:18 +00:00
Diego Biurrun
9ba6004993 Remove useless #ifdef.
Originally committed as revision 7625 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 22:02:12 +00:00
Måns Rullgård
f9aba097a3 remove useless #ifdef CONFIG_ZLIB
Originally committed as revision 7624 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:58:32 +00:00
Måns Rullgård
e3d2a690e8 remove useless #ifdef CONFIG_ZLIB
Originally committed as revision 7623 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:55:10 +00:00
Måns Rullgård
299c77d569 it's called libgsm, not just gsm
Originally committed as revision 7622 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:45:48 +00:00
Benjamin Larsson
21f6aa108f Remove debug line.
Originally committed as revision 7621 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:25:16 +00:00
Benjamin Larsson
8adc51f2ad Add flashsv encoder to changelog and fix the encoder so it actually works.
Originally committed as revision 7620 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:24:05 +00:00
Måns Rullgård
621b4c4cef reorder alphabetically
Originally committed as revision 7619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:20:18 +00:00
Måns Rullgård
90d912afd9 remove no longer needed ifeq tests
Originally committed as revision 7618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-01-21 21:06:10 +00:00