mirror of https://git.ffmpeg.org/ffmpeg.git
25b9eef410
* qatar/master: cljr: K&R cosmetics cljr: return a more sensible value when encountering invalid headers cljr: drop unnecessary emms_c() calls without MMX code cljr: remove useless casts cljr: group encode/decode parts under single ifdefs cljr: remove stray semicolon cljr: add missing return statement in decode_end() doc: add pulseaudio to the input list avconv: remove unsubstantiated comment shorten: avoid abort() on unknown audio types cljr: add encoder build: merge lists of HTML documentation targets tests/examples: Mark some variables only used within their files as static. tests/tools/examples: Replace direct exit() calls by return. x86 cpuid: set vendor union members separately cljr: release picture at end of decoding rv40: NEON optimised rv40 qpel motion compensation Conflicts: doc/examples/muxing.c libavcodec/cljr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| .. | ||
| build_libstagefright | ||
| clean-diff | ||
| cws2fws.c | ||
| enum_options.c | ||
| graph2dot.c | ||
| lavfi-showfiltfmts.c | ||
| patcheck | ||
| pktdumper.c | ||
| probetest.c | ||
| qt-faststart.c | ||
| trasher.c | ||
| unwrap-diff | ||