diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 04:46:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-10 04:46:13 +0200 |
| commit | 633b90ca8d5fbdac4e54b0d6b054e273b3a5efa5 (patch) | |
| tree | 9c351711a68105bf554ee1153b0e4c59f9dae87a /libavcodec/qdm2.c | |
| parent | 969267482de97b08503d27d2fe090ec820273e40 (diff) | |
| parent | 0db9eba48c8a27bc2373d02edda3340ef6f0e5fc (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
motion_est: drop inline from sad_hpel_motion_search()
motion_est: remove unused macros
motion_est: remove useless no_motion_search() function
lagarith: frame multithreading
doxygen: qdm2: Drop documentation for non-existing function parameters
build: add HOSTOBJS to SUBDIR_VARS list
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qdm2.c')
| -rw-r--r-- | libavcodec/qdm2.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c index dd13c6ecc9..3a77e7fe06 100644 --- a/libavcodec/qdm2.c +++ b/libavcodec/qdm2.c @@ -1105,7 +1105,6 @@ static int process_subpacket_9 (QDM2Context *q, QDM2SubPNode *node) * * @param q context * @param node pointer to node with packet - * @param length packet length in bits */ static void process_subpacket_10 (QDM2Context *q, QDM2SubPNode *node) { @@ -1154,7 +1153,6 @@ static void process_subpacket_11 (QDM2Context *q, QDM2SubPNode *node) * * @param q context * @param node pointer to node with packet - * @param length packet length in bits */ static void process_subpacket_12 (QDM2Context *q, QDM2SubPNode *node) { |