Michael Niedermayer 3cecef5b03 ffmpeg: dont allow -flags to override -pass
Fixes Ticket2154

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ccf9dd00da055e94117b56cead4af80ff331b00e)

Conflicts:
	ffmpeg_opt.c
2013-02-06 10:17:32 +01:00
2012-06-07 00:55:26 +02:00
2012-05-08 08:39:37 +02:00
2012-05-04 18:40:36 +02:00
2012-05-28 19:33:43 +02:00
2012-09-19 03:11:27 +02:00
2012-09-15 00:27:17 +02:00
2012-05-24 21:15:01 +02:00
2012-04-06 10:23:26 +02:00
2012-09-15 00:27:17 +02:00
2012-09-15 00:27:17 +02:00

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory in git.
  You can also view it online at http://ffmpeg.org/documentation.html

2) Licensing
------------

* See the LICENSE file.

3) Build and Install
--------------------

* See the INSTALL file.
Description
No description provided
Readme 209 MiB
Languages
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%