summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-08-09 00:26:38 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-08-09 00:51:02 +0200
commit11a1033c9fcae380f4da06b2b0253ab0eb82b026 (patch)
treecee0379ce616e16ef342622b77fe417fa604c014 /.gitignore
parent4270d8c04d354b928d2329abd1037c6f0a72c07f (diff)
parent5864eb427f2f05342136f3bc9727d826e68d8dbf (diff)
downloadffmpeg-streaming-11a1033c9fcae380f4da06b2b0253ab0eb82b026.zip
ffmpeg-streaming-11a1033c9fcae380f4da06b2b0253ab0eb82b026.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: (23 commits) build: cosmetics: Reorder some lists in a more logical fashion x86: pngdsp: Fix assembly for OS/2 fate: add test for RTjpeg in nuv with frameheader rtmp: send check_bw as notification g723_1: clip argument for 15-bit version of normalize_bits() g723_1: use all LPC vectors in formant postfilter id3v2: Support v2.2 PIC avplay: fix build with lavfi disabled. avconv: split configuring filter configuration to a separate file. avconv: split option parsing into a separate file. mpc8: do not leave padding after last frame in buffer for the next decode call mpegaudioenc: list supported channel layouts. mpegaudiodec: don't print an error on > 1 frame in a packet. api-example: update to new audio encoding API. configure: add --enable/disable-random option doc: cygwin: Update list of FATE package requirements build: Remove all installed headers and header directories on uninstall build: change checkheaders to use regular build rules rtmp: Add a new option 'rtmp_subscribe' rtmp: Add support for subscribing live streams ... Conflicts: Makefile common.mak configure doc/examples/decoding_encoding.c ffmpeg.c libavcodec/g723_1.c libavcodec/mpegaudiodec.c libavcodec/x86/pngdsp.asm libavformat/version.h library.mak tests/fate/video.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 77c9859..5bf3341 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
*.def
*.dll
*.exe
-*.ho
+*.h.c
*.lib
*.pc
*.so
OpenPOWER on IntegriCloud