]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8943925 74a9a62)
Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 14:17:16 +0000 (15:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 14 Jan 2013 14:17:16 +0000 (15:17 +0100)
commit4adc8a29a0565cb35815eeb8e693b47dcaf890ce
tree69f03cedcda1457ba0c5303c2dc70437aa38f0c0tree | snapshot
parent8943925d1f68316218a9722c3f275ae1ae29b325commit | diff
parent74a9a624c5c4d50760d8d57458eba57366f6cb26commit | diff
Merge commit '74a9a624c5c4d50760d8d57458eba57366f6cb26'

* commit '74a9a624c5c4d50760d8d57458eba57366f6cb26':
  vcr1: return a meaningful error code.
  rpza: return a meaningful error code.
  qdrw: cosmetics, reformat

Conflicts:
libavcodec/qdrw.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/qdrw.c diff1 | diff2 | blob | history
libavcodec/rpza.c diff1 | diff2 | blob | history
libavcodec/vcr1.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.