path: root/etc
diff options
authorUoti Urpala <>2012-07-02 02:35:57 +0300
committerUoti Urpala <>2012-07-16 21:08:42 +0300
commit2ba8b91a97e7e873a522f365e41a293af980c91a (patch)
tree40a17dd313350955ecdb285c06fbba005caa4ad9 /etc
parent39a45c7a175acf7ef5546073f62f5b9b7f83a893 (diff)
build, codec-cfg.c: simplify builtin codecs.conf handling
The player can read codec mapping (codecs.conf) from an external file or use embedded defaults. Before, the defaults were stored in the player binary in the form of final already-parsed data structures. Simplify things by storing the text of the codecs.conf file instead, and parse that at runtime the same way an external file would be parsed. To create the previous parsed form, the build system first compiled a separate binary named "codec-cfg", which parsed etc/codecs.conf and then wrote the results as a C data structure that could be compiled into the program. The new simple conversion of codecs.conf into a C string is handled by the new script TOOLS/ After removing the codec-cfg binary, HOST_CC is no longer used for anything. Remove the --host-cc configure option and associated logic. Also remove the codec2html and codec-cfg-test functionality. Building those was already broken and nobody cared. There was a broken 3-character-long "fourcc" entry in etc/codecs.conf. This happened to be accepted before but triggered a parse error after the changes. Remove the broken entry and make the parsing functions explicitly test for this error.
Diffstat (limited to 'etc')
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/codecs.conf b/etc/codecs.conf
index edec66ecce..2767c7ac3c 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -3,7 +3,7 @@
; Before editing this file, please read DOCS/tech/codecs.conf.txt !
-release 20110311
+release 20120702
@@ -777,7 +777,7 @@ videocodec ffindeo2
videocodec ffflv
info "FFmpeg Flash video"
status working
- fourcc FLV1,flv
+ fourcc FLV1
driver ffmpeg
dll flv