History

Revert "replace FFMPEG with LIBAV in FFMPEG_CONFIGURATION"

This reverts commit 29ba091136a5e04574f7bfc1b17536c923958f6f.

Michael Niedermayer committed 15 years ago

Commit e528cda1 parent 0cb886210 files · +21 −21Browse files

Unified · Split

10 files
  1. Makefile +1 −1
  2. cmdutils.c +2 −2
  3. configure +11 −11
  4. libavcodec/utils.c +1 −1
  5. libavdevice/avdevice.c +1 −1
  6. libavfilter/avfilter.c +1 −1
  7. libavformat/utils.c +1 −1
  8. libavutil/utils.c +1 −1
  9. libpostproc/postprocess.c +1 −1
  10. libswscale/utils.c +1 −1
Makefile+1−1
@@ -177,7 +177,7 @@ distclean:: · 176 unmodified lines
177177 $(RM) version.h config.* libavutil/avconfig.h
178178
179179 config:
180− $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION)
180+ $(SRC_PATH)/configure $(value FFMPEG_CONFIGURATION)
181181
182182 # regression tests
183183
cmdutils.c+2−2
@@ -399,7 +399,7 @@ static int warned_cfg = 0; · 398 unmodified lines
399399 } \
400400 if (flags & SHOW_CONFIG) { \
401401 const char *cfg = libname##_configuration(); \
402− if (strcmp(LIBAV_CONFIGURATION, cfg)) { \
402+ if (strcmp(FFMPEG_CONFIGURATION, cfg)) { \
403403 if (!warned_cfg) { \
404404 fprintf(outstream, \
405405 "%sWARNING: library configuration mismatch\n", \
@@ -429,7 +429,7 @@ void show_banner(void) · 23 unmodified lines
429429 program_name, program_birth_year, this_year);
430430 fprintf(stderr, " built on %s %s with %s %s\n",
431431 __DATE__, __TIME__, CC_TYPE, CC_VERSION);
432− fprintf(stderr, " configuration: " LIBAV_CONFIGURATION "\n");
432+ fprintf(stderr, " configuration: " FFMPEG_CONFIGURATION "\n");
433433 print_all_libs_info(stderr, INDENT|SHOW_CONFIG);
434434 print_all_libs_info(stderr, INDENT|SHOW_VERSION);
435435 }
configure+11−11
@@ -1672,7 +1672,7 @@ for v in "$@"; do · 1671 unmodified lines
16721672 r=${v#*=}
16731673 l=${v%"$r"}
16741674 r=$(sh_quote "$r")
1675− LIBAV_CONFIGURATION="${LIBAV_CONFIGURATION# } ${l}${r}"
1675+ FFMPEG_CONFIGURATION="${FFMPEG_CONFIGURATION# } ${l}${r}"
16761676 done
16771677
16781678 find_things(){
@@ -1784,7 +1784,7 @@ done · 105 unmodified lines
17841784
17851785 disabled logging && logfile=/dev/null
17861786
1787−echo "# $0 $LIBAV_CONFIGURATION" > $logfile
1787+echo "# $0 $FFMPEG_CONFIGURATION" > $logfile
17881788 set >> $logfile
17891789
17901790 test -n "$cross_prefix" && enable cross_compile
@@ -2479,7 +2479,7 @@ case $target_os in · 688 unmodified lines
24792479 ;;
24802480 esac
24812481
2482−echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$LIBAV_CONFIGURATION" >config.fate
2482+echo "config:$arch:$subarch:$cpu:$target_os:$cc_ident:$FFMPEG_CONFIGURATION" >config.fate
24832483
24842484 check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
24852485
@@ -3202,9 +3202,9 @@ config_files="$TMPH config.mak" · 716 unmodified lines
32023202
32033203 cat > config.mak <<EOF
32043204 # Automatically generated by configure - do not modify!
3205−ifndef LIBAV_CONFIG_MAK
3206−LIBAV_CONFIG_MAK=1
3207−LIBAV_CONFIGURATION=$LIBAV_CONFIGURATION
3205+ifndef FFMPEG_CONFIG_MAK
3206+FFMPEG_CONFIG_MAK=1
3207+FFMPEG_CONFIGURATION=$FFMPEG_CONFIGURATION
32083208 prefix=$prefix
32093209 LIBDIR=\$(DESTDIR)$libdir
32103210 SHLIBDIR=\$(DESTDIR)$shlibdir
@@ -3293,9 +3293,9 @@ get_version LIBAVFILTER libavfilter/avfilter.h · 82 unmodified lines
32933293
32943294 cat > $TMPH <<EOF
32953295 /* Automatically generated by configure - do not modify! */
3296−#ifndef LIBAV_CONFIG_H
3297−#define LIBAV_CONFIG_H
3298−#define LIBAV_CONFIGURATION "$(c_escape $LIBAV_CONFIGURATION)"
3296+#ifndef FFMPEG_CONFIG_H
3297+#define FFMPEG_CONFIG_H
3298+#define FFMPEG_CONFIGURATION "$(c_escape $FFMPEG_CONFIGURATION)"
32993299 #define FFMPEG_LICENSE "$(c_escape $license)"
33003300 #define FFMPEG_DATADIR "$(eval c_escape $datadir)"
33013301 #define CC_TYPE "$cc_type"
@@ -3347,8 +3347,8 @@ LAVFI_TESTS=$(print_enabled -n _test $LAVFI_TESTS) · 45 unmodified lines
33473347 SEEK_TESTS=$(print_enabled -n _test $SEEK_TESTS)
33483348 EOF
33493349
3350−echo "#endif /* LIBAV_CONFIG_H */" >> $TMPH
3351−echo "endif # LIBAV_CONFIG_MAK" >> config.mak
3350+echo "#endif /* FFMPEG_CONFIG_H */" >> $TMPH
3351+echo "endif # FFMPEG_CONFIG_MAK" >> config.mak
33523352
33533353 # Do not overwrite an unchanged config.h to avoid superfluous rebuilds.
33543354 cp_if_changed $TMPH config.h
libavcodec/utils.c+1−1
@@ -1078,7 +1078,7 @@ unsigned avcodec_version( void ) · 1077 unmodified lines
10781078
10791079 const char *avcodec_configuration(void)
10801080 {
1081− return LIBAV_CONFIGURATION;
1081+ return FFMPEG_CONFIGURATION;
10821082 }
10831083
10841084 const char *avcodec_license(void)
libavdevice/avdevice.c+1−1
@@ -25,7 +25,7 @@ unsigned avdevice_version(void) · 24 unmodified lines
2525
2626 const char * avdevice_configuration(void)
2727 {
28− return LIBAV_CONFIGURATION;
28+ return FFMPEG_CONFIGURATION;
2929 }
3030
3131 const char * avdevice_license(void)
libavfilter/avfilter.c+1−1
@@ -34,7 +34,7 @@ unsigned avfilter_version(void) { · 33 unmodified lines
3434
3535 const char *avfilter_configuration(void)
3636 {
37− return LIBAV_CONFIGURATION;
37+ return FFMPEG_CONFIGURATION;
3838 }
3939
4040 const char *avfilter_license(void)
libavformat/utils.c+1−1
@@ -54,7 +54,7 @@ unsigned avformat_version(void) · 53 unmodified lines
5454
5555 const char *avformat_configuration(void)
5656 {
57− return LIBAV_CONFIGURATION;
57+ return FFMPEG_CONFIGURATION;
5858 }
5959
6060 const char *avformat_license(void)
libavutil/utils.c+1−1
@@ -31,7 +31,7 @@ unsigned avutil_version(void) · 30 unmodified lines
3131
3232 const char *avutil_configuration(void)
3333 {
34− return LIBAV_CONFIGURATION;
34+ return FFMPEG_CONFIGURATION;
3535 }
3636
3737 const char *avutil_license(void)
libpostproc/postprocess.c+1−1
@@ -94,7 +94,7 @@ unsigned postproc_version(void) · 93 unmodified lines
9494
9595 const char *postproc_configuration(void)
9696 {
97− return LIBAV_CONFIGURATION;
97+ return FFMPEG_CONFIGURATION;
9898 }
9999
100100 const char *postproc_license(void)
libswscale/utils.c+1−1
@@ -53,7 +53,7 @@ unsigned swscale_version(void) · 52 unmodified lines
5353
5454 const char *swscale_configuration(void)
5555 {
56− return LIBAV_CONFIGURATION;
56+ return FFMPEG_CONFIGURATION;
5757 }
5858
5959 const char *swscale_license(void)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t